Merge branch 'bug_9020' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 20 Nov 2012 13:00:32 +0000 (08:00 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Tue, 20 Nov 2012 13:00:32 +0000 (08:00 -0500)

Trivial merge