Merge branch 'bug_9330' into 3.12-master
authorJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 1 Feb 2013 17:02:13 +0000 (12:02 -0500)
committerJared Camins-Esakov <jcamins@cpbibliography.com>
Fri, 1 Feb 2013 17:02:13 +0000 (12:02 -0500)

Trivial merge