simonmar 2004/10/05 06:21:08 PDT Modified files: (Branch: ghc-6-2-branch) libraries/base/System Time.hsc Log: merge rev. 1.25 Revision Changes Path 1.21.2.2 +1 -1 fptools/libraries/base/System/Time.hsc