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

Trivial merge