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

[Simon Peyton Jones]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/c848891acfc7059a6ef19c80ec7958c26e1327fe

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

commit c848891acfc7059a6ef19c80ec7958c26e1327fe
Merge: 10377bb... 55cdcc9...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Aug 15 14:24:43 2012 +0100

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

 compiler/main/CmdLineParser.hs    |   12 +++++---
 compiler/main/DriverPipeline.hs   |    7 ++++-
 compiler/typecheck/TcInstDcls.lhs |    2 +-
 docs/users_guide/glasgow_exts.xml |   52 ++++++++++---------------------------
 ghc/InteractiveUI.hs              |    4 ++-
 ghc/Main.hs                       |    9 +++++-
 mk/config.mk.in                   |    2 +-
 rts/Linker.c                      |   39 +++++++++++++++++++++++++---
 rts/Proftimer.c                   |    8 +++---
 rts/Proftimer.h                   |    2 -
 rules/haddock.mk                  |    3 +-
 11 files changed, 80 insertions(+), 60 deletions(-)