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

Trivial merge