Merge branch 'master' of http://darcs.haskell.org/testsuite
authorSimon Peyton Jones <simonpj@microsoft.com>
Thu, 21 Jun 2012 07:49:22 +0000 (08:49 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Thu, 21 Jun 2012 07:49:22 +0000 (08:49 +0100)

Trivial merge