simonmar 2006/01/10 04:00:53 PST Modified files: (Branch: ghc-6-4-branch) libraries/base/GHC Conc.lhs Log: merge rev. 1.52 Revision Changes Path 1.36.2.9 +22 -4 fptools/libraries/base/GHC/Conc.lhs