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

author Adam Megacz <adam@megacz.com>

Mon, 25 Apr 2011 00:31:58 +0000 (17:31 -0700)

committer Adam Megacz <adam@megacz.com>

Mon, 25 Apr 2011 00:31:58 +0000 (17:31 -0700)
author Adam Megacz <adam@megacz.com>
Mon, 25 Apr 2011 00:31:58 +0000 (17:31 -0700)
committer Adam Megacz <adam@megacz.com>
Mon, 25 Apr 2011 00:31:58 +0000 (17:31 -0700)
diff --cc compiler/basicTypes/Name.lhs
Simple merge
diff --cc compiler/basicTypes/OccName.lhs
Simple merge
diff --cc compiler/main/DynFlags.hs
Simple merge
diff --cc compiler/typecheck/TcRnTypes.lhs
Simple merge
diff --cc ghc.mk
Simple merge
author	Adam Megacz <adam@megacz.com>
	Mon, 25 Apr 2011 00:31:58 +0000 (17:31 -0700)
committer	Adam Megacz <adam@megacz.com>
	Mon, 25 Apr 2011 00:31:58 +0000 (17:31 -0700)
		1	2
compiler/basicTypes/Name.lhs	patch \|	diff1 \|	diff2 \|	blob \| history
compiler/basicTypes/OccName.lhs	patch \|	diff1 \|	diff2 \|	blob \| history
compiler/main/DynFlags.hs	patch \|	diff1 \|	diff2 \|	blob \| history
compiler/typecheck/TcRnTypes.lhs	patch \|	diff1 \|	diff2 \|	blob \| history
ghc.mk	patch \|	diff1 \|	diff2 \|	blob \| history