[commit: ghc] master: Merge branch 'master' of http://darcs.haskell.org/ghc (057384f)

[Simon Peyton Jones]

Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/057384f93b3d2c31d0d0e3041923ca6a6aa7a03d

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

commit 057384f93b3d2c31d0d0e3041923ca6a6aa7a03d
Merge: 91b44bc... 900e7d2...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Thu Jan 17 10:55:10 2013 +0000

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

 rts/Stats.h |    8 ++++----
 rts/sm/GC.c |   25 +++++++++++++------------
 2 files changed, 17 insertions(+), 16 deletions(-)