Fri Jun 12 12:24:20 EDT 2009 geoff
    applied a different fix, as discussed.