simonmar 2005/02/21 02:27:42 PST Modified files: (Branch: ghc-6-4-branch) libraries/Cabal/doc Cabal.xml Log: merge rev. 1.14 Revision Changes Path 1.1.2.14 +79 -26 fptools/libraries/Cabal/doc/Cabal.xml