Merge branch 'bug_9353' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 20 Mar 2013 18:47:42 +0000 (14:47 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 20 Mar 2013 18:47:42 +0000 (14:47 -0400)

Trivial merge