[commit: ghc] ghc-lwc2: Merge branch 'master' into ghc-lwc2 (126de3f)

[Ian Lynagh]

Repository : http://darcs.haskell.org/ghc.git/

On branch  : ghc-lwc2

http://hackage.haskell.org/trac/ghc/changeset/126de3f14e791f14b4f18f149efab0d993743dee

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

commit 126de3f14e791f14b4f18f149efab0d993743dee
Merge: ded08e4 0ee3165
Author: KC Sivaramakrishnan <chandras at cs.purdue.edu>
Date:   Wed Feb 27 11:33:28 2013 -0500

    Merge branch 'master' into ghc-lwc2

 aclocal.m4                           |  4 +++-
 compiler/hsSyn/HsDecls.lhs           | 18 ++++++------------
 compiler/main/SysTools.lhs           |  3 ++-
 compiler/parser/Lexer.x              |  9 ++++++---
 compiler/rename/RnSource.lhs         |  3 ++-
 docs/users_guide/glasgow_exts.xml    |  8 ++++++++
 ghc.mk                               |  2 +-
 includes/Cmm.h                       |  8 +++++++-
 includes/rts/storage/SMPClosureOps.h |  4 ++--
 libraries/random                     |  2 +-
 rts/Updates.h                        |  4 ++--
 settings.in                          |  1 +
 12 files changed, 41 insertions(+), 25 deletions(-)