Merge branch 'bug_9431' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 11 Mar 2013 12:46:59 +0000 (08:46 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Mon, 11 Mar 2013 12:46:59 +0000 (08:46 -0400)

Trivial merge