Merge branch 'bug_9182' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 15 Jan 2013 04:24:02 +0000 (23:24 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 15 Jan 2013 04:24:02 +0000 (23:24 -0500)

Trivial merge