Sun Sep 30 15:01:26 EDT 2007 geoff
    applying only some of this patch, notably points 1, 2 and 5.
    undone parts will not be done either.