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

[Simon Peyton Jones]

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

On branch  : master

https://github.com/ghc/ghc/commit/b84da617c4dadcfbf47796e7a75c21d6b4c4947a

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

commit b84da617c4dadcfbf47796e7a75c21d6b4c4947a
Merge: f3bfbd5 9d33fc3
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Apr 3 18:20:23 2013 +0100

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

 mk/build.mk.sample | 2 +-
 rts/ghc.mk         | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)