simonmar 2005/02/24 01:42:14 PST Modified files: (Branch: ghc-6-4-branch) libraries/Cabal/doc Cabal.xml Log: merge rev. 1.18 Revision Changes Path 1.1.2.18 +60 -45 fptools/libraries/Cabal/doc/Cabal.xml