merge upstream HEAD
authorAdam Megacz <megacz@cs.berkeley.edu>
Wed, 20 Apr 2011 17:29:56 +0000 (10:29 -0700)
committerAdam Megacz <megacz@cs.berkeley.edu>
Wed, 20 Apr 2011 17:29:56 +0000 (10:29 -0700)
commitcf5905ea24904cf73a041fd7535e8723a668cb9a
tree7a52ebd4b5216cf27f8759d5f2fc4e6f896eb6d0
parent6cec61d14a324285dbb8ce73d4c7215f1f8d6766
parent25fa4bdbff4a84d6717c4ff7cdf7080687616818
merge upstream HEAD
compiler/cmm/CLabel.hs
compiler/main/DynFlags.hs
compiler/rename/RnEnv.lhs
compiler/rename/RnExpr.lhs
compiler/types/TypeRep.lhs