Merge branch 'bug_8032' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 30 Nov 2012 12:29:15 +0000 (07:29 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 30 Nov 2012 12:29:15 +0000 (07:29 -0500)

Trivial merge