Merge branch 'bug_7253' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 12 Feb 2013 15:00:46 +0000 (10:00 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 12 Feb 2013 15:00:46 +0000 (10:00 -0500)

Trivial merge