Merge branch 'master' of http://darcs.haskell.org//ghc
authorIan Lynagh <igloo@earth.li>
Tue, 15 May 2012 17:18:19 +0000 (18:18 +0100)
committerIan Lynagh <igloo@earth.li>
Tue, 15 May 2012 17:18:19 +0000 (18:18 +0100)

Trivial merge