[commit: base] master: Merge branch 'master' of darcs.haskell.org:/srv/darcs//packages/base (4725825)

[Ian Lynagh]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/47258256819558d3bf99aaba62f9857cbdc750fa

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

commit 47258256819558d3bf99aaba62f9857cbdc750fa
Merge: ea74625... 6613018...
Author: Ian Lynagh <igloo at earth.li>
Date:   Tue Jun 19 19:36:46 2012 +0100

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

 GHC/ForeignPtr.hs |    1 +
 GHC/Stats.hsc     |   19 ++++++++++++++++---
 2 files changed, 17 insertions(+), 3 deletions(-)