Merge branch 'bug_9555' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 11 Mar 2013 11:40:50 +0000 (07:40 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 11 Mar 2013 11:40:50 +0000 (07:40 -0400)

Trivial merge