Merge branch 'bug_2832' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 28 Nov 2012 13:17:58 +0000 (08:17 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 28 Nov 2012 13:17:58 +0000 (08:17 -0500)

Trivial merge