Merge branch 'master' of http://darcs.haskell.org/ghc
authorIan Lynagh <igloo@earth.li>
Tue, 25 Oct 2011 19:49:34 +0000 (20:49 +0100)
committerIan Lynagh <igloo@earth.li>
Tue, 25 Oct 2011 19:49:34 +0000 (20:49 +0100)

Trivial merge