Merge branch 'master' of http://darcs.haskell.org/testsuite
authorSimon Peyton Jones <simonpj@microsoft.com>
Thu, 7 Jun 2012 11:14:05 +0000 (12:14 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Thu, 7 Jun 2012 11:14:05 +0000 (12:14 +0100)

Trivial merge