Merge branch 'bug_9907' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 22 Mar 2013 21:50:17 +0000 (17:50 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 22 Mar 2013 21:50:17 +0000 (17:50 -0400)

Trivial merge