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

[Simon Peyton Jones]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/804d8f6036e3c646255132e2da42f81cd81e5154

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

commit 804d8f6036e3c646255132e2da42f81cd81e5154
Merge: 33683ba... 426a027...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Mon Feb 11 08:38:33 2013 +0000

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

 aclocal.m4                         |   25 ++++++++++++++++++-------
 compiler/ghc.cabal.in              |    1 +
 compiler/main/DynFlags.hs          |    5 ++++-
 compiler/main/PlatformConstants.hs |   12 ++++++++++++
 configure.ac                       |   12 +++++++++++-
 sync-all                           |    2 +-
 6 files changed, 47 insertions(+), 10 deletions(-)