Merge branch 'bug_9933' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 15 Apr 2013 12:31:44 +0000 (08:31 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 15 Apr 2013 12:31:44 +0000 (08:31 -0400)

Trivial merge