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

[Ian Lynagh]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/0bde816110b3ee306a096fd5372441d2e294360e

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

commit 0bde816110b3ee306a096fd5372441d2e294360e
Merge: 7dca6c2... 7624efc...
Author: Ian Lynagh <igloo at earth.li>
Date:   Tue Aug 2 22:40:58 2011 +0100

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

 compiler/basicTypes/Name.lhs        |   22 ++++-
 compiler/iface/BinIface.hs          |    2 +-
 compiler/iface/IfaceEnv.lhs         |   20 +----
 compiler/iface/LoadIface.lhs        |   19 ++--
 compiler/iface/MkIface.lhs          |   72 +++++----------
 compiler/main/HscTypes.lhs          |   50 ++++++-----
 compiler/prelude/PrelInfo.lhs       |   23 ++---
 compiler/rename/RnEnv.lhs           |   12 +--
 compiler/rename/RnNames.lhs         |  174 ++++++++++++++++-------------------
 compiler/rename/RnSource.lhs        |    2 +-
 compiler/simplCore/OccurAnal.lhs    |   84 ++++++++++-------
 compiler/simplCore/SimplUtils.lhs   |    5 +-
 compiler/typecheck/TcSplice.lhs     |   10 ++
 compiler/typecheck/TcTyClsDecls.lhs |    9 ++-
 14 files changed, 252 insertions(+), 252 deletions(-)