Merge branch 'bug_8832' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 9 Nov 2012 04:23:52 +0000 (23:23 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 9 Nov 2012 04:23:52 +0000 (23:23 -0500)

Trivial merge