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

author Jose Pedro Magalhaes <jpm@cs.uu.nl>

Tue, 17 May 2011 06:51:09 +0000 (08:51 +0200)

committer Jose Pedro Magalhaes <jpm@cs.uu.nl>

Tue, 17 May 2011 06:51:09 +0000 (08:51 +0200)
author Jose Pedro Magalhaes <jpm@cs.uu.nl>
Tue, 17 May 2011 06:51:09 +0000 (08:51 +0200)
committer Jose Pedro Magalhaes <jpm@cs.uu.nl>
Tue, 17 May 2011 06:51:09 +0000 (08:51 +0200)
diff --cc compiler/deSugar/Check.lhs
Simple merge
diff --cc compiler/deSugar/DsMeta.hs
Simple merge
diff --cc compiler/hsSyn/HsBinds.lhs
Simple merge
diff --cc compiler/hsSyn/HsUtils.lhs
Simple merge
diff --cc compiler/main/DynFlags.hs
Simple merge
diff --cc compiler/parser/Lexer.x
Simple merge
author	Jose Pedro Magalhaes <jpm@cs.uu.nl>
	Tue, 17 May 2011 06:51:09 +0000 (08:51 +0200)
committer	Jose Pedro Magalhaes <jpm@cs.uu.nl>
	Tue, 17 May 2011 06:51:09 +0000 (08:51 +0200)
		1	2
compiler/deSugar/Check.lhs	patch \|	diff1 \|	diff2 \|	blob \| history
compiler/deSugar/DsMeta.hs	patch \|	diff1 \|	diff2 \|	blob \| history
compiler/hsSyn/HsBinds.lhs	patch \|	diff1 \|	diff2 \|	blob \| history
compiler/hsSyn/HsUtils.lhs	patch \|	diff1 \|	diff2 \|	blob \| history
compiler/main/DynFlags.hs	patch \|	diff1 \|	diff2 \|	blob \| history
compiler/parser/Lexer.x	patch \|	diff1 \|	diff2 \|	blob \| history