simonmar 2005/02/10 02:17:22 PST Modified files: (Branch: ghc-6-4-branch) libraries/Cabal/doc Cabal.xml Log: merge rev. 1.5 Revision Changes Path 1.1.2.5 +73 -1 fptools/libraries/Cabal/doc/Cabal.xml