simonmar 2005/02/11 01:33:58 PST Modified files: (Branch: ghc-6-4-branch) libraries/network network.cabal Log: merge rev. 1.2 Revision Changes Path 1.1.2.1 +1 -1 fptools/libraries/network/network.cabal