patch applied (cabal): Merge conflicts

20 Oct 2010

      Wed Oct 20 04:22:00 PDT 2010  Ian Lynagh 
  * Merge conflicts

    M ./Distribution/TestSuite.hs +1

View patch online:
http://darcs.haskell.org/cgi-bin/darcsweb.cgi?r=cabal;a=darcs_commitdiff;h=2...