merge up to ghc HEAD 16-Apr-2011
authorAdam Megacz <megacz@cs.berkeley.edu>
Sat, 16 Apr 2011 23:56:37 +0000 (16:56 -0700)
committerAdam Megacz <megacz@cs.berkeley.edu>
Sun, 17 Apr 2011 01:21:58 +0000 (18:21 -0700)
commit6cec61d14a324285dbb8ce73d4c7215f1f8d6766
treed582a8337e67153ad2e107648604b1299713acdf
parent11b33eaeaef39fcba8ee9258213068ed90362aa7
parent163d12852002a67c5b661b4b3e7e3c5bb6faa5f3
merge up to ghc HEAD 16-Apr-2011
compiler/cmm/CLabel.hs
compiler/deSugar/Desugar.lhs
compiler/ghc.cabal.in
compiler/hetmet
compiler/main/DynFlags.hs
compiler/prelude/PrelNames.lhs
compiler/rename/RnExpr.lhs
ghc.mk
libraries/base