Merge branch 'bug_7919' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 7 Dec 2012 23:30:36 +0000 (18:30 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 7 Dec 2012 23:30:36 +0000 (18:30 -0500)

Trivial merge