Merge branch 'bug_7243' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 24 Jan 2013 14:26:37 +0000 (09:26 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 24 Jan 2013 14:26:37 +0000 (09:26 -0500)

Trivial merge