simonmar 2006/02/01 08:16:52 PST Modified files: (Branch: ghc-6-4-branch) libraries/base/GHC Conc.lhs Log: merge rev. 1.48 Revision Changes Path 1.36.2.10 +46 -13 fptools/libraries/base/GHC/Conc.lhs