simonmar 2005/02/10 01:34:56 PST Modified files: (Branch: ghc-6-4-branch) libraries/Cabal/doc Cabal.xml Log: merge rev. 1.2 Revision Changes Path 1.1.2.2 +28 -26 fptools/libraries/Cabal/doc/Cabal.xml