Merge branch 'bug_7189' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 30 Nov 2012 13:02:14 +0000 (08:02 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 30 Nov 2012 13:02:14 +0000 (08:02 -0500)

Trivial merge