Merge branch 'bug_9418' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 1 Feb 2013 16:26:25 +0000 (11:26 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 1 Feb 2013 16:26:25 +0000 (11:26 -0500)

Trivial merge