Merge branch 'master' of c:/code/HEAD-git/. into ghc-generics

author unknown <simonpj@.europe.corp.microsoft.com>

Wed, 13 Apr 2011 08:18:39 +0000 (09:18 +0100)

committer unknown <simonpj@.europe.corp.microsoft.com>

Wed, 13 Apr 2011 08:18:39 +0000 (09:18 +0100)
author unknown <simonpj@.europe.corp.microsoft.com>
Wed, 13 Apr 2011 08:18:39 +0000 (09:18 +0100)
committer unknown <simonpj@.europe.corp.microsoft.com>
Wed, 13 Apr 2011 08:18:39 +0000 (09:18 +0100)
diff --cc compiler/hsSyn/HsUtils.lhs
Simple merge
diff --cc compiler/rename/RnBinds.lhs
Simple merge
diff --cc compiler/typecheck/TcRnDriver.lhs
Simple merge
author	unknown <simonpj@.europe.corp.microsoft.com>
	Wed, 13 Apr 2011 08:18:39 +0000 (09:18 +0100)
committer	unknown <simonpj@.europe.corp.microsoft.com>
	Wed, 13 Apr 2011 08:18:39 +0000 (09:18 +0100)
		1	2
compiler/hsSyn/HsUtils.lhs	patch \|	diff1 \|	diff2 \|	blob \| history
compiler/rename/RnBinds.lhs	patch \|	diff1 \|	diff2 \|	blob \| history
compiler/typecheck/TcRnDriver.lhs	patch \|	diff1 \|	diff2 \|	blob \| history