simonmar 2005/02/10 01:54:39 PST Modified files: (Branch: ghc-6-4-branch) libraries/Cabal/doc Cabal.xml Log: merge rev. 1.4 Revision Changes Path 1.1.2.4 +24 -15 fptools/libraries/Cabal/doc/Cabal.xml