[commit: ghc] master: Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc (0dc9f1c)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/0dc9f1c7ea41699519e14d269dc22077ad725a69

>---------------------------------------------------------------

commit 0dc9f1c7ea41699519e14d269dc22077ad725a69
Merge: 3f90064... 571ecdd...
Author: Ian Lynagh <ian at well-typed.com>
Date:   Thu Jan 17 23:22:50 2013 +0000

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

 compiler/main/CmdLineParser.hs  |   10 ++++++++
 compiler/main/DriverPipeline.hs |    7 +++++-
 compiler/main/DynFlags.hs       |   47 ++++++++++++++++++++-------------------
 rts/Task.c                      |    9 -------
 rts/Task.h                      |    6 -----
 rts/sm/GCTDecl.h                |    2 +-
 rts/sm/GCThread.h               |    4 +++
 rts/sm/Storage.c                |    7 +++++
 8 files changed, 52 insertions(+), 40 deletions(-)