Merge branch 'bug_9058' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 20 Nov 2012 12:02:00 +0000 (07:02 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 20 Nov 2012 12:02:00 +0000 (07:02 -0500)

Trivial merge