Merge branch 'coloured-core' of https://github.com/nominolo/ghc into coloured-core

author Ian Lynagh <igloo@earth.li>

Sun, 8 May 2011 15:13:33 +0000 (16:13 +0100)

committer Ian Lynagh <igloo@earth.li>

Sun, 8 May 2011 15:13:33 +0000 (16:13 +0100)
author Ian Lynagh <igloo@earth.li>
Sun, 8 May 2011 15:13:33 +0000 (16:13 +0100)
committer Ian Lynagh <igloo@earth.li>
Sun, 8 May 2011 15:13:33 +0000 (16:13 +0100)
diff --cc compiler/basicTypes/Module.lhs
Simple merge
diff --cc compiler/main/DynFlags.hs
Simple merge
diff --cc compiler/nativeGen/AsmCodeGen.lhs
Simple merge
diff --cc compiler/typecheck/TcRnMonad.lhs
Simple merge
diff --cc compiler/utils/Outputable.lhs
Simple merge
author	Ian Lynagh <igloo@earth.li>
	Sun, 8 May 2011 15:13:33 +0000 (16:13 +0100)
committer	Ian Lynagh <igloo@earth.li>
	Sun, 8 May 2011 15:13:33 +0000 (16:13 +0100)
		1	2
compiler/basicTypes/Module.lhs	patch \|	diff1 \|	diff2 \|	blob \| history
compiler/main/DynFlags.hs	patch \|	diff1 \|	diff2 \|	blob \| history
compiler/nativeGen/AsmCodeGen.lhs	patch \|	diff1 \|	diff2 \|	blob \| history
compiler/typecheck/TcRnMonad.lhs	patch \|	diff1 \|	diff2 \|	blob \| history
compiler/utils/Outputable.lhs	patch \|	diff1 \|	diff2 \|	blob \| history