Merge branch 'bug_9434' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 20 Mar 2013 19:54:23 +0000 (15:54 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 20 Mar 2013 19:54:23 +0000 (15:54 -0400)

Trivial merge