Merge branch 'bug_9610' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 30 Mar 2013 12:46:18 +0000 (08:46 -0400)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Sat, 30 Mar 2013 12:46:18 +0000 (08:46 -0400)

Trivial merge