simonmar 2005/02/10 04:34:37 PST Modified files: (Branch: ghc-6-4-branch) libraries/Cabal/doc Cabal.xml Log: merge rev. 1.6 Revision Changes Path 1.1.2.6 +41 -89 fptools/libraries/Cabal/doc/Cabal.xml