simonmar 2005/02/10 05:12:27 PST Modified files: (Branch: ghc-6-4-branch) libraries/Cabal/doc Cabal.xml Log: merge rev. 1.7 Revision Changes Path 1.1.2.7 +22 -3 fptools/libraries/Cabal/doc/Cabal.xml