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

[Ian Lynagh]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/35b32a08e8ddb4e479e8c7d67a120ef80c61c322

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

commit 35b32a08e8ddb4e479e8c7d67a120ef80c61c322
Merge: 1f04616... 0936621...
Author: Ian Lynagh <igloo at earth.li>
Date:   Fri Mar 16 23:27:16 2012 +0000

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

 compiler/coreSyn/CorePrep.lhs       |   14 +++--
 compiler/deSugar/DsMeta.hs          |   87 +++++++++++++++++++++++++++-------
 compiler/hsSyn/Convert.lhs          |   30 ++++++++----
 compiler/hsSyn/HsDecls.lhs          |    6 +-
 compiler/hsSyn/HsTypes.lhs          |   22 ++-------
 compiler/hsSyn/HsUtils.lhs          |    2 +-
 compiler/parser/Parser.y.pp         |    8 ++--
 compiler/parser/ParserCore.y        |    2 +-
 compiler/parser/RdrHsSyn.lhs        |   11 ++--
 compiler/rename/RnTypes.lhs         |   24 +++++----
 compiler/typecheck/TcEnv.lhs        |    7 +--
 compiler/typecheck/TcHsType.lhs     |   10 ++--
 compiler/typecheck/TcTyClsDecls.lhs |    7 ++-
 compiler/types/FamInstEnv.lhs       |    1 -
 compiler/utils/Outputable.lhs       |    5 +-
 docs/users_guide/glasgow_exts.xml   |   29 +++++++-----
 16 files changed, 159 insertions(+), 106 deletions(-)