Merge branch 'master' of http://darcs.haskell.org/ghc
authorIan Lynagh <igloo@earth.li>
Wed, 26 Oct 2011 18:06:53 +0000 (19:06 +0100)
committerIan Lynagh <igloo@earth.li>
Wed, 26 Oct 2011 18:06:53 +0000 (19:06 +0100)

Trivial merge