Merge branch 'bug_9395' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 15 Feb 2013 23:30:35 +0000 (18:30 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 15 Feb 2013 23:30:35 +0000 (18:30 -0500)

Trivial merge