Merge branch 'bug_9585' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 15 Feb 2013 13:13:44 +0000 (08:13 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 15 Feb 2013 13:13:44 +0000 (08:13 -0500)

Trivial merge