Merge branch 'bug_6898' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 13 Mar 2013 12:15:24 +0000 (08:15 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 13 Mar 2013 12:15:24 +0000 (08:15 -0400)

Trivial merge