These bits are taken from the FSF anoncvs repo on 11-Oct-2002 22:39:35 PDT.
until I've made the commits to resolve the conflicts. Submitted by: Doug Rabson <dfr>