Merge branch 'bug_7143' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 28 Nov 2012 13:24:54 +0000 (08:24 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 28 Nov 2012 13:24:54 +0000 (08:24 -0500)

Trivial merge