merge upstream HEAD

author Adam Megacz <megacz@cs.berkeley.edu>

Wed, 20 Apr 2011 17:29:56 +0000 (10:29 -0700)

committer Adam Megacz <megacz@cs.berkeley.edu>

Wed, 20 Apr 2011 17:29:56 +0000 (10:29 -0700)
author Adam Megacz <megacz@cs.berkeley.edu>
Wed, 20 Apr 2011 17:29:56 +0000 (10:29 -0700)
committer Adam Megacz <megacz@cs.berkeley.edu>
Wed, 20 Apr 2011 17:29:56 +0000 (10:29 -0700)
diff --cc compiler/cmm/CLabel.hs
Simple merge
diff --cc compiler/main/DynFlags.hs
Simple merge
diff --cc compiler/rename/RnEnv.lhs
Simple merge
diff --cc compiler/rename/RnExpr.lhs
Simple merge
diff --cc compiler/types/TypeRep.lhs
Simple merge
author	Adam Megacz <megacz@cs.berkeley.edu>
	Wed, 20 Apr 2011 17:29:56 +0000 (10:29 -0700)
committer	Adam Megacz <megacz@cs.berkeley.edu>
	Wed, 20 Apr 2011 17:29:56 +0000 (10:29 -0700)
		1	2
compiler/cmm/CLabel.hs	patch \|	diff1 \|	diff2 \|	blob \| history
compiler/main/DynFlags.hs	patch \|	diff1 \|	diff2 \|	blob \| history
compiler/rename/RnEnv.lhs	patch \|	diff1 \|	diff2 \|	blob \| history
compiler/rename/RnExpr.lhs	patch \|	diff1 \|	diff2 \|	blob \| history
compiler/types/TypeRep.lhs	patch \|	diff1 \|	diff2 \|	blob \| history