Merge branch 'bug_9476' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 7 Feb 2013 12:39:52 +0000 (07:39 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 7 Feb 2013 12:39:52 +0000 (07:39 -0500)

Trivial merge