simonmar 2005/05/12 02:32:24 PDT Modified files: (Branch: ghc-6-4-branch) ghc/includes STM.h Log: merge rev. 1.4 Revision Changes Path 1.2.2.1 +5 -0 fptools/ghc/includes/STM.h