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

[Ian Lynagh]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/7bb9684495e6724d6325719e76926cd35535f3af

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

commit 7bb9684495e6724d6325719e76926cd35535f3af
Merge: 78d8681... 6490ea6...
Author: Ian Lynagh <igloo at earth.li>
Date:   Wed Apr 27 00:33:28 2011 +0100

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

 compiler/basicTypes/NameSet.lhs  |    5 +-
 compiler/hsSyn/HsDecls.lhs       |   30 +++-----
 compiler/hsSyn/HsImpExp.lhs      |   11 +--
 compiler/iface/MkIface.lhs       |   34 +++++-----
 compiler/main/DriverMkDepend.hs  |    2 -
 compiler/main/DriverPipeline.hs  |    4 +-
 compiler/main/GhcMake.hs         |    9 +--
 compiler/main/HscMain.lhs        |   11 ++--
 compiler/main/HscTypes.lhs       |    2 +-
 compiler/parser/Lexer.x          |   42 ++++++------
 compiler/prelude/PrelRules.lhs   |    2 +-
 compiler/rename/RnSource.lhs     |    2 +-
 compiler/typecheck/TcForeign.lhs |  137 +++++++++++++++++++-------------------
 13 files changed, 135 insertions(+), 156 deletions(-)