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

author Simon Peyton Jones <simonpj@microsoft.com>

Thu, 12 May 2011 10:22:50 +0000 (11:22 +0100)

committer Simon Peyton Jones <simonpj@microsoft.com>

Thu, 12 May 2011 10:22:50 +0000 (11:22 +0100)
author Simon Peyton Jones <simonpj@microsoft.com>
Thu, 12 May 2011 10:22:50 +0000 (11:22 +0100)
committer Simon Peyton Jones <simonpj@microsoft.com>
Thu, 12 May 2011 10:22:50 +0000 (11:22 +0100)
diff --cc compiler/hsSyn/HsBinds.lhs
Simple merge
diff --cc compiler/hsSyn/HsUtils.lhs
Simple merge
diff --cc compiler/typecheck/TcSplice.lhs
Simple merge
author	Simon Peyton Jones <simonpj@microsoft.com>
	Thu, 12 May 2011 10:22:50 +0000 (11:22 +0100)
committer	Simon Peyton Jones <simonpj@microsoft.com>
	Thu, 12 May 2011 10:22:50 +0000 (11:22 +0100)
		1	2
compiler/hsSyn/HsBinds.lhs	patch \|	diff1 \|	diff2 \|	blob \| history
compiler/hsSyn/HsUtils.lhs	patch \|	diff1 \|	diff2 \|	blob \| history
compiler/typecheck/TcSplice.lhs	patch \|	diff1 \|	diff2 \|	blob \| history