Merge branch 'master' of http://darcs.haskell.org/ghc
authorIan Lynagh <igloo@earth.li>
Tue, 2 Aug 2011 21:40:58 +0000 (22:40 +0100)
committerIan Lynagh <igloo@earth.li>
Tue, 2 Aug 2011 21:40:58 +0000 (22:40 +0100)

Trivial merge