Merge branch 'bug_9382' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 31 Jan 2013 16:34:24 +0000 (11:34 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 31 Jan 2013 16:34:24 +0000 (11:34 -0500)

Trivial merge