patch applied (cabal): Resolve Makefile conflict from importing Cabal-with-install patches.

[email protected] Wed, 10 Jan 2007 10:02:21 -0800

Newsgroups	gmane.comp.lang.haskell.cvs.all
Message-ID	<20070110180221.GA12655__3884.51045514575$1168452175$gmane$org@cvs.haskell.org>

Wed Jan 10 08:38:52 PST 2007  [email protected]
  * Resolve Makefile conflict from importing Cabal-with-install patches.

    M ./Makefile +3