Merge branch 'bug_8975' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 20 Nov 2012 12:42:48 +0000 (07:42 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 20 Nov 2012 12:42:48 +0000 (07:42 -0500)

Trivial merge