Merge branch 'bug_9912' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 23 Mar 2013 13:13:32 +0000 (09:13 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 23 Mar 2013 13:13:32 +0000 (09:13 -0400)

Trivial merge