Merge branch 'bug_9945' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 30 Mar 2013 21:10:41 +0000 (17:10 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 30 Mar 2013 21:10:41 +0000 (17:10 -0400)

Trivial merge