simonmar 2004/01/08 07:33:28 PST Modified files: (Branch: ghc-6-2-branch) libraries/base/GHC Conc.lhs Log: merge rev. 1.22 Revision Changes Path 1.19.2.3 +2 -4 fptools/libraries/base/GHC/Conc.lhs