simonmar 2003/09/26 01:52:41 PDT Modified files: (Branch: ghc-6-2-branch) libraries/base/System CPUTime.hsc Log: merge rev. 1.12 Revision Changes Path 1.11.8.1 +8 -2 fptools/libraries/base/System/CPUTime.hsc