simonmar 2004/01/07 04:45:24 PST Modified files: (Branch: ghc-6-2-branch) libraries/base/GHC Conc.lhs Log: merge rev. 1.21 Revision Changes Path 1.19.2.2 +12 -6 fptools/libraries/base/GHC/Conc.lhs