[commit: ghc] master: Merge ../HEAD (da9a330)

[Simon Peyton Jones]

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

On branch  : master

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

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

commit da9a3302f964021bfdf820108dc21d5ca0404dc6
Merge: f26027e... d6918e9...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Thu Aug 23 15:30:38 2012 +0100

    Merge ../HEAD

 compiler/basicTypes/RdrName.lhs    |   21 +++----
 compiler/coreSyn/TrieMap.lhs       |  111 ++++++++++++++++++++++++++++++++----
 compiler/main/HscTypes.lhs         |    3 +-
 compiler/rename/RnEnv.lhs          |    7 ++-
 compiler/rename/RnNames.lhs        |    5 +-
 compiler/typecheck/TcBinds.lhs     |   57 ++++++++++++++++--
 compiler/typecheck/TcCanonical.lhs |   12 ++--
 compiler/typecheck/TcEvidence.lhs  |   23 +++----
 compiler/typecheck/TcMType.lhs     |   34 +++++++++++-
 compiler/typecheck/TcSimplify.lhs  |   46 ++-------------
 10 files changed, 224 insertions(+), 95 deletions(-)