Merge branch 'bug_9922' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 30 Mar 2013 02:25:28 +0000 (22:25 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 30 Mar 2013 02:25:28 +0000 (22:25 -0400)

Trivial merge