Merge branch 'master' of http://darcs.haskell.org/ghc
authorIan Lynagh <igloo@earth.li>
Wed, 27 Jul 2011 18:57:24 +0000 (19:57 +0100)
committerIan Lynagh <igloo@earth.li>
Wed, 27 Jul 2011 18:57:24 +0000 (19:57 +0100)

Trivial merge