Merge branch 'bug_8945' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 2 Nov 2012 16:00:32 +0000 (12:00 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 2 Nov 2012 16:00:32 +0000 (12:00 -0400)

Trivial merge