Merge branch 'master' of http://darcs.haskell.org/ghc
authorIan Lynagh <igloo@earth.li>
Thu, 23 Jun 2011 17:37:24 +0000 (18:37 +0100)
committerIan Lynagh <igloo@earth.li>
Thu, 23 Jun 2011 17:37:24 +0000 (18:37 +0100)

Trivial merge