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

Trivial merge