Merge branch 'bug_7368' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 20 Nov 2012 12:24:55 +0000 (07:24 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 20 Nov 2012 12:24:55 +0000 (07:24 -0500)

Trivial merge