Merge branch 'bug_9034' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 8 Feb 2013 00:36:24 +0000 (19:36 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 8 Feb 2013 00:36:24 +0000 (19:36 -0500)

Trivial merge