simonmar 2005/04/07 07:36:31 PDT Modified files: (Branch: ghc-6-4-branch) libraries/base/GHC Conc.lhs Log: merge rev. 1.42 Revision Changes Path 1.36.2.6 +32 -8 fptools/libraries/base/GHC/Conc.lhs