Patch from Michael Jerris. darcs-hash:20061121073502-65a35-02dccc31fdb723770afce915e4fd1a816caf820f.gz