ross 2005/06/20 03:36:14 PDT Modified files: (Branch: ghc-6-4-branch) libraries/Cabal/doc Cabal.xml Log: merge rev. 1.26 Revision Changes Path 1.1.2.22 +4 -2 fptools/libraries/Cabal/doc/Cabal.xml