Merge branch 'master' of http://darcs.haskell.org//ghc
authorIan Lynagh <igloo@earth.li>
Thu, 17 May 2012 01:01:42 +0000 (02:01 +0100)
committerIan Lynagh <igloo@earth.li>
Thu, 17 May 2012 01:01:42 +0000 (02:01 +0100)

Trivial merge