simonmar 2005/10/19 02:44:17 PDT Modified files: (Branch: ghc-6-4-branch) libraries/base/System CPUTime.hsc Log: merge rev. 1.17 Revision Changes Path 1.16.2.1 +2 -2 fptools/libraries/base/System/CPUTime.hsc