Merge branch 'master' of http://darcs.haskell.org/ghc
authorIan Lynagh <igloo@earth.li>
Wed, 6 Apr 2011 17:16:20 +0000 (18:16 +0100)
committerIan Lynagh <igloo@earth.li>
Wed, 6 Apr 2011 17:16:20 +0000 (18:16 +0100)

Trivial merge