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

Trivial merge