Merge branch 'bug_7875' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 20 Mar 2013 12:41:00 +0000 (08:41 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 20 Mar 2013 12:41:00 +0000 (08:41 -0400)

Trivial merge