Wed Oct 20 04:22:00 PDT 2010 Ian Lynagh <igloo at earth.li> * Merge conflicts M ./Distribution/TestSuite.hs +1 View patch online: http://darcs.haskell.org/cgi-bin/darcsweb.cgi?r=cabal;a=darcs_commitdiff;h=20101020112200-3fd76-78b66c12dc745a1d0a568f813cd7ed9abdf8e1ae.gz