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

[Simon Peyton Jones]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/4d20dc8b47269f3df8f0e9c3720a37e88f0992e0

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

commit 4d20dc8b47269f3df8f0e9c3720a37e88f0992e0
Merge: 4f7599d... 30eee19...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Apr 4 14:17:54 2012 +0100

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

 compiler/ghc.cabal.in             |   36 ++----
 compiler/hsSyn/Convert.lhs        |    2 +-
 compiler/main/Packages.lhs        |  265 ++++++++++++++++++-------------------
 compiler/parser/Lexer.x           |   25 ++++-
 compiler/parser/Parser.y.pp       |    5 +
 compiler/simplCore/OccurAnal.lhs  |  111 ++++++++++++++--
 compiler/typecheck/TcForeign.lhs  |   15 +-
 compiler/typecheck/TcSplice.lhs   |   29 ++++-
 compiler/typecheck/TcType.lhs     |   45 +++++--
 compiler/types/Unify.lhs          |    6 +
 compiler/utils/Panic.lhs          |   14 ++-
 docs/users_guide/flags.xml        |    6 +
 docs/users_guide/glasgow_exts.xml |   46 +++++++
 ghc/InteractiveUI.hs              |    3 +-
 14 files changed, 407 insertions(+), 201 deletions(-)