Merge branch 'bug_9432' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 6 Feb 2013 17:31:41 +0000 (12:31 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 6 Feb 2013 17:31:41 +0000 (12:31 -0500)

Trivial merge