Merge branch 'bug_9570' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 7 Mar 2013 14:34:00 +0000 (09:34 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Thu, 7 Mar 2013 14:34:00 +0000 (09:34 -0500)

Trivial merge