simonmar 2005/05/06 05:47:16 PDT Modified files: (Branch: ghc-6-4-branch) libraries/Cabal/doc Cabal.xml Log: merge rev. 1.20 Revision Changes Path 1.1.2.20 +7 -5 fptools/libraries/Cabal/doc/Cabal.xml