Merge branch 'bug_9343' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 23 Jan 2013 01:01:22 +0000 (20:01 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 23 Jan 2013 01:01:22 +0000 (20:01 -0500)

Trivial merge