Merge branch 'bug_7804' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 20 Mar 2013 18:51:23 +0000 (14:51 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 20 Mar 2013 18:51:23 +0000 (14:51 -0400)

Trivial merge