Merge branch 'bug_8842' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 5 Nov 2012 13:41:50 +0000 (08:41 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 5 Nov 2012 13:41:50 +0000 (08:41 -0500)

Trivial merge