Merge branch 'bug_7143' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 15 Jan 2013 04:22:17 +0000 (23:22 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 15 Jan 2013 04:22:17 +0000 (23:22 -0500)

Trivial merge