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

Trivial merge