Merge branch 'master' of http://darcs.haskell.org/ghc
authorIan Lynagh <igloo@earth.li>
Sat, 25 Jun 2011 18:16:42 +0000 (19:16 +0100)
committerIan Lynagh <igloo@earth.li>
Sat, 25 Jun 2011 18:16:42 +0000 (19:16 +0100)

Trivial merge