Merge branch 'bug_9360' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 15 Jan 2013 03:53:01 +0000 (22:53 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 15 Jan 2013 03:53:01 +0000 (22:53 -0500)

Trivial merge