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

Trivial merge