Merge branch 'bug_9554' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 20 Mar 2013 01:02:01 +0000 (21:02 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Wed, 20 Mar 2013 01:02:01 +0000 (21:02 -0400)

Trivial merge