Merge branch 'bug_9020' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 25 Nov 2012 23:36:09 +0000 (18:36 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sun, 25 Nov 2012 23:36:09 +0000 (18:36 -0500)

Trivial merge