Merge branch 'bug_9376' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 18 Jan 2013 02:08:59 +0000 (21:08 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 18 Jan 2013 02:08:59 +0000 (21:08 -0500)

Trivial merge