[commit: ghc] master: Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc (e778d3d)

[Ian Lynagh]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/e778d3d7f715fcf99e517a31687f75fa4fd83dd5

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

commit e778d3d7f715fcf99e517a31687f75fa4fd83dd5
Merge: 5089023... 5490e71...
Author: Ian Lynagh <igloo at earth.li>
Date:   Tue Jun 19 19:36:26 2012 +0100

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

 compiler/hsSyn/Convert.lhs |    2 +-
 includes/rts/storage/GC.h  |    1 +
 rts/Linker.c               |    1 +
 rts/Stats.c                |    5 +++++
 utils/runghc/ghc.mk        |    3 +++
 5 files changed, 11 insertions(+), 1 deletions(-)