Merge branch 'bug_8954' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 20 Nov 2012 19:40:15 +0000 (14:40 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 20 Nov 2012 19:40:15 +0000 (14:40 -0500)

Trivial merge