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

[Simon Peyton Jones]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/0768ddbdf39a1d713b5154e5952b7f0757743010

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

commit 0768ddbdf39a1d713b5154e5952b7f0757743010
Merge: bf069cb... bc31dbe...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue Jan 29 12:50:12 2013 +0000

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

 aclocal.m4           |   20 ++++++++++++++++----
 compiler/cmm/PprC.hs |    7 +++++--
 ghc.mk               |    2 ++
 rts/ghc.mk           |   10 +++++-----
 4 files changed, 28 insertions(+), 11 deletions(-)