Merge branch 'bug_9403' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 21 Mar 2013 16:02:26 +0000 (12:02 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 21 Mar 2013 16:02:26 +0000 (12:02 -0400)

Trivial merge