Merge branch 'bug_9455' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 20 Feb 2013 13:23:16 +0000 (08:23 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 20 Feb 2013 13:23:16 +0000 (08:23 -0500)

Trivial merge