Merge branch 'bug_9471' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 12 Feb 2013 14:14:49 +0000 (09:14 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 12 Feb 2013 14:14:49 +0000 (09:14 -0500)

Trivial merge