simonmar 2002/08/30 01:49:58 PDT Modified files: (Branch: ghc-5-04-branch) libraries/base/GHC Conc.lhs Log: merge rev. 1.11 Revision Changes Path 1.10.2.1 +1 -1 fptools/libraries/base/GHC/Conc.lhs