Merge branch 'master' of http://darcs.haskell.org/ghc
authorIan Lynagh <igloo@earth.li>
Mon, 27 Jun 2011 15:48:34 +0000 (16:48 +0100)
committerIan Lynagh <igloo@earth.li>
Mon, 27 Jun 2011 15:48:34 +0000 (16:48 +0100)

Trivial merge