Merge branch 'bug_9035' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 13 Mar 2013 12:50:11 +0000 (08:50 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 13 Mar 2013 12:50:11 +0000 (08:50 -0400)

Trivial merge