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

[Ian Lynagh]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/54ba45317a213ca4bf9d3bd26ecacfce776ce695

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

commit 54ba45317a213ca4bf9d3bd26ecacfce776ce695
Merge: e610292... b215384...
Author: Ian Lynagh <igloo at earth.li>
Date:   Thu Sep 15 14:45:37 2011 +0100

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

 compiler/basicTypes/MkId.lhs        |   27 +++++------
 compiler/coreSyn/CorePrep.lhs       |   84 +++++++++++++++++++----------------
 compiler/main/DriverPhases.hs       |    2 +-
 compiler/prelude/TysWiredIn.lhs     |    4 +-
 compiler/typecheck/TcDeriv.lhs      |   67 ++++++++++++++++++++-------
 compiler/typecheck/TcGenDeriv.lhs   |   19 +++++---
 compiler/typecheck/TcTyClsDecls.lhs |    3 +-
 7 files changed, 123 insertions(+), 83 deletions(-)