Sorry, did mess up in testing the last patch.

darcs-hash:20060916000515-7ad00-3874991f9121ac80b2b3b66d4f5ac166702df1d1.gz