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

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

Wed, 27 Apr 2011 11:20:57 +0000 (13:20 +0200)

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

Wed, 27 Apr 2011 11:20:57 +0000 (13:20 +0200)
author Jose Pedro Magalhaes <jpm@cs.uu.nl>
Wed, 27 Apr 2011 11:20:57 +0000 (13:20 +0200)
committer Jose Pedro Magalhaes <jpm@cs.uu.nl>
Wed, 27 Apr 2011 11:20:57 +0000 (13:20 +0200)
diff --cc compiler/basicTypes/OccName.lhs
Simple merge
diff --cc compiler/iface/MkIface.lhs
Simple merge
diff --cc compiler/parser/Lexer.x
Simple merge
diff --cc compiler/rename/RnBinds.lhs
Simple merge
diff --cc compiler/rename/RnSource.lhs
Simple merge
author	Jose Pedro Magalhaes <jpm@cs.uu.nl>
	Wed, 27 Apr 2011 11:20:57 +0000 (13:20 +0200)
committer	Jose Pedro Magalhaes <jpm@cs.uu.nl>
	Wed, 27 Apr 2011 11:20:57 +0000 (13:20 +0200)
		1	2
compiler/basicTypes/OccName.lhs	patch \|	diff1 \|	diff2 \|	blob \| history
compiler/iface/MkIface.lhs	patch \|	diff1 \|	diff2 \|	blob \| history
compiler/parser/Lexer.x	patch \|	diff1 \|	diff2 \|	blob \| history
compiler/rename/RnBinds.lhs	patch \|	diff1 \|	diff2 \|	blob \| history
compiler/rename/RnSource.lhs	patch \|	diff1 \|	diff2 \|	blob \| history