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

[Ian Lynagh]

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

On branch  : master

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

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

commit a7e113619cf3c3e169daeec0cf5db52d95ebdebc
Merge: 8986122... 6957078...
Author: Ian Lynagh <igloo at earth.li>
Date:   Tue Mar 20 15:02:29 2012 +0000

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

 compiler/deSugar/DsMeta.hs       |  110 ++++++++++++++++---------------------
 compiler/deSugar/DsMonad.lhs     |    5 ++-
 compiler/simplCore/SetLevels.lhs |    3 +-
 3 files changed, 54 insertions(+), 64 deletions(-)