ross 2005/06/14 10:04:53 PDT Modified files: (Branch: ghc-6-4-branch) libraries/Cabal/doc Cabal.xml Log: merge rev. 1.25 Revision Changes Path 1.1.2.21 +11 -9 fptools/libraries/Cabal/doc/Cabal.xml