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

[Simon Peyton Jones]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/536ee09fc4bcf2c8084bbbcb5c7a62025e31a7a6

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

commit 536ee09fc4bcf2c8084bbbcb5c7a62025e31a7a6
Merge: 1b81f15... b2a9fbf...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Feb 15 11:43:43 2013 +0000

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

 compiler/main/TidyPgm.lhs        |    9 ++++++---
 compiler/simplCore/SimplCore.lhs |    6 ++++++
 mk/config.mk.in                  |    1 +
 mk/custom-settings.mk            |    2 +-
 4 files changed, 14 insertions(+), 4 deletions(-)