[commit: ghc] master: Merge branch 'master' of http://darcs.haskell.org/ghc (5943886)

[Simon Peyton Jones]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/594388682075c4f8b40570464b53933d9c16f0a4

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

commit 594388682075c4f8b40570464b53933d9c16f0a4
Merge: d79c0c4... a7f9930...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue Jan 29 08:57:26 2013 +0000

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

 compiler/ghc.cabal.in             |    1 -
 compiler/main/DynFlags.hs         |   22 +++-
 compiler/main/DynFlags.hs-boot    |    8 +-
 compiler/main/GHC.hs              |    5 +-
 compiler/main/StaticFlagParser.hs |  151 -----------------------
 compiler/main/StaticFlags.hs      |  241 ++++++++++++++++++++++++++-----------
 compiler/main/StaticFlags.hs-boot |    4 +
 compiler/utils/Outputable.lhs     |    5 +-
 ghc/Main.hs                       |    1 -
 9 files changed, 204 insertions(+), 234 deletions(-)