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

Trivial merge