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

[Simon Peyton Jones]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/53ed79af423772fbf912fe14349d9cbaf75a6228

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

commit 53ed79af423772fbf912fe14349d9cbaf75a6228
Merge: 6fb7bf8... 36bc454...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Aug 15 14:24:52 2012 +0100

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

 GHC/Profiling.hs |    6 ++++++
 base.cabal       |    1 +
 2 files changed, 7 insertions(+), 0 deletions(-)