Merge branch 'bug_8982' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 31 Oct 2012 21:22:35 +0000 (17:22 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 31 Oct 2012 21:22:35 +0000 (17:22 -0400)

Trivial merge