simonmar 2005/02/15 01:08:27 PST Modified files: (Branch: ghc-6-4-branch) libraries/Cabal/doc Cabal.xml Log: merge rev. 1.12 Revision Changes Path 1.1.2.12 +21 -16 fptools/libraries/Cabal/doc/Cabal.xml