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

Trivial merge