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

[Simon Peyton Jones]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/1aa022846d82f2f26a65a8d8259884c8cd221146

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

commit 1aa022846d82f2f26a65a8d8259884c8cd221146
Merge: 157dd07... 8783718...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue Jan 17 10:30:46 2012 +0000

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

 compiler/llvmGen/LlvmCodeGen.hs   |    5 +-
 compiler/main/CodeOutput.lhs      |  159 +++++++++++++++++--------------------
 compiler/main/DriverPipeline.hs   |   10 ++-
 compiler/main/DynFlags.hs         |   21 +++--
 docs/users_guide/glasgow_exts.xml |   20 +++--
 rts/Capability.c                  |    1 +
 6 files changed, 110 insertions(+), 106 deletions(-)