Merge branch 'master' into type-nats

Conflicts:
	compiler/typecheck/TcCanonical.lhs
	compiler/typecheck/TcSMonad.lhs

1 files changed, 8 insertions, 8 deletions

diff --git a/compiler/codeGen/StgCmmProf.hs b/compiler/codeGen/StgCmmProf.hs
index 88031dce48..6d16f012b3 100644
--- a/compiler/codeGen/StgCmmProf.hs
+++ b/compiler/codeGen/StgCmmProf.hs
@@ -223,14 +223,14 @@ emitCostCentreDecl cc = do
                 -- All cost centres will be in the main package, since we
                 -- don't normally use -auto-all or add SCCs to other packages.
                 -- Hence don't emit the package name in the module here.
-  ; let lits = [ zero,   	-- StgInt ccID,
-	      	 label,	-- char *label,
-                 modl,  -- char *module,
-                 loc,   -- char *srcloc,
-                 zero,  -- StgWord time_ticks
-              	 zero64,	-- StgWord64 mem_alloc
-                 is_caf,   -- StgInt is_caf
-                 zero   -- struct _CostCentre *link
+  ; let lits = [ zero,    -- StgInt ccID,
+	      	 label,	  -- char *label,
+                 modl,    -- char *module,
+                 loc,     -- char *srcloc,
+                 zero64,  -- StgWord64 mem_alloc
+                 zero,    -- StgWord time_ticks
+                 is_caf,  -- StgInt is_caf
+                 zero     -- struct _CostCentre *link
 	       ] 
   ; emitDataLits (mkCCLabel cc) lits
   }