Merge branch 'bug_9420' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 15 Feb 2013 14:04:20 +0000 (09:04 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 15 Feb 2013 14:04:20 +0000 (09:04 -0500)

Trivial merge