Merge branch 'bug_9107' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 20 Nov 2012 11:57:38 +0000 (06:57 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 20 Nov 2012 11:57:38 +0000 (06:57 -0500)

Trivial merge