[commit: base] master: Merge branch 'master' of http://darcs.haskell.org//packages/base (8fd36ef)

[Simon Peyton Jones]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/base

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/8fd36ef76a4ebdec6ba4f66f676974fb14c47017

>---------------------------------------------------------------

commit 8fd36ef76a4ebdec6ba4f66f676974fb14c47017
Merge: 24c3a71... 3b51b74...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Jan 25 13:31:06 2013 +0000

    Merge branch 'master' of http://darcs.haskell.org//packages/base

 GHC/Event/Clock.hsc |  105 +++-----------------------------------------------
 GHC/Event/Thread.hs |    2 -
 GHC/Generics.hs     |   22 +++++-----
 System/CPUTime.hsc  |   24 +----------
 aclocal.m4          |   74 +++++++++++++++++------------------
 base.cabal          |    1 +
 cbits/sysconf.c     |   19 +++++++++
 tests/Numeric/all.T |    5 ++-
 8 files changed, 81 insertions(+), 171 deletions(-)