[commit: ghc] type-holes-branch: Merge https://github.com/ghc/ghc (d14e37b)

[Simon Peyton Jones]

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

On branch  : type-holes-branch

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

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

commit d14e37b3556fe72a7dd9749a5c37128cdc50708a
Merge: 7b55caf... 24746fe...
Author: Thijs Alkemade <thijsalkemade at gmail.com>
Date:   Sat Apr 21 13:56:54 2012 +0200

    Merge https://github.com/ghc/ghc

 compiler/deSugar/DsMeta.hs        |    5 ++-
 compiler/hsSyn/Convert.lhs        |   36 ++++++++++++++++---------------
 compiler/hsSyn/HsDecls.lhs        |    8 +++---
 compiler/parser/Parser.y.pp       |   13 +++++------
 compiler/parser/RdrHsSyn.lhs      |    5 ++-
 compiler/rename/RnSource.lhs      |   42 +++++++++++++++++++++---------------
 compiler/typecheck/TcInstDcls.lhs |    4 ++-
 compiler/typecheck/TcInteract.lhs |   18 ++++++++-------
 compiler/typecheck/TcSMonad.lhs   |   14 +++++++++--
 configure.ac                      |   13 ++++++++--
 10 files changed, 93 insertions(+), 65 deletions(-)