Merge branch 'bug_9421' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 6 Feb 2013 17:37:20 +0000 (12:37 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 6 Feb 2013 17:37:20 +0000 (12:37 -0500)

Trivial merge