Merge branch 'bug_9662' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 20 Feb 2013 14:56:00 +0000 (09:56 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 20 Feb 2013 14:56:00 +0000 (09:56 -0500)

Trivial merge