These bits are taken from the FSF anoncvs repo on 23-May-2004 04:41:00 UTC.
until I've made the commits to resolve the conflicts. Submitted by: Doug Rabson <dfr>