Merge branch 'bug_9341' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 20 Mar 2013 00:45:48 +0000 (20:45 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 20 Mar 2013 00:45:48 +0000 (20:45 -0400)

Trivial merge