Merge branch 'master' of http://darcs.haskell.org//ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Mon, 30 Apr 2012 12:43:33 +0000 (13:43 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Mon, 30 Apr 2012 12:43:33 +0000 (13:43 +0100)

Trivial merge