Merge branch 'bug_9392' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 9 Feb 2013 02:39:08 +0000 (21:39 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 9 Feb 2013 02:39:08 +0000 (21:39 -0500)

Trivial merge