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

[Ian Lynagh]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/3c06774882e24f69cd5d5acb6ddb3a100ff7f7d4

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

commit 3c06774882e24f69cd5d5acb6ddb3a100ff7f7d4
Merge: 417eb15... f41c6e3...
Author: Ian Lynagh <igloo at earth.li>
Date:   Sat Jun 16 23:26:42 2012 +0100

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