simonmar 2005/02/11 01:31:41 PST Modified files: (Branch: ghc-6-4-branch) libraries/Cabal Cabal.cabal Log: merge rev. 1.6 Revision Changes Path 1.5.2.1 +2 -1 fptools/libraries/Cabal/Cabal.cabal