Merge branch 'master' of http://darcs.haskell.org/ghc
authorIan Lynagh <igloo@earth.li>
Tue, 26 Apr 2011 23:33:28 +0000 (00:33 +0100)
committerIan Lynagh <igloo@earth.li>
Tue, 26 Apr 2011 23:33:28 +0000 (00:33 +0100)

Trivial merge