Merge branch 'master' of http://darcs.haskell.org/ghc
authorIan Lynagh <igloo@earth.li>
Tue, 5 Jul 2011 19:41:09 +0000 (20:41 +0100)
committerIan Lynagh <igloo@earth.li>
Tue, 5 Jul 2011 19:41:09 +0000 (20:41 +0100)

Trivial merge