Merge branch 'bug_9402' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 24 Jan 2013 13:56:37 +0000 (08:56 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 24 Jan 2013 13:56:37 +0000 (08:56 -0500)

Trivial merge