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

[Simon Peyton Jones]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/ac4b3761389c623e1e8c4a3274edc7eded4c0656

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

commit ac4b3761389c623e1e8c4a3274edc7eded4c0656
Merge: eb21a97... 9911ec5...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Mon Dec 5 04:49:28 2011 +0000

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

 ghc.mk |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)