Merge branch 'master' of http://darcs.haskell.org/ghc
authorIan Lynagh <igloo@earth.li>
Sun, 3 Apr 2011 12:46:22 +0000 (13:46 +0100)
committerIan Lynagh <igloo@earth.li>
Sun, 3 Apr 2011 12:46:22 +0000 (13:46 +0100)

Trivial merge