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

[Simon Peyton Jones]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/3f968822a7e1ffd4759a9b7d2c618eb4162bddcf

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

commit 3f968822a7e1ffd4759a9b7d2c618eb4162bddcf
Merge: 23b27e2... 4bbe9f7...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Mar 14 17:29:23 2012 +0000

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

 compiler/typecheck/TcType.lhs     |    9 ++++++---
 ghc/InteractiveUI.hs              |   13 +++++++------
 ghc/Main.hs                       |    5 +++++
 includes/Stg.h                    |    2 +-
 includes/ghc.mk                   |   31 +++++++++++++++++--------------
 includes/rts/storage/InfoTables.h |    2 +-
 rts/ClosureFlags.c                |   18 +++++++++---------
 rts/Printer.c                     |    2 +-
 8 files changed, 47 insertions(+), 35 deletions(-)