Merge branch 'bug_8945' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 4 Dec 2012 13:29:26 +0000 (08:29 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 4 Dec 2012 13:29:26 +0000 (08:29 -0500)

Trivial merge