Merge branch 'bug_7241' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 21 Mar 2013 15:44:15 +0000 (11:44 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 21 Mar 2013 15:44:15 +0000 (11:44 -0400)

Trivial merge