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

[Simon Peyton Jones]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/0646c349b304b43c80334596c8a3145ef3b6d99e

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

commit 0646c349b304b43c80334596c8a3145ef3b6d99e
Merge: d50cb3e... 4884546...
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Thu Apr 26 13:51:26 2012 +0100

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

 compiler/simplCore/FloatIn.lhs |   16 ++++++++++++----
 1 files changed, 12 insertions(+), 4 deletions(-)