Merge branch 'master' of http://darcs.haskell.org/testsuite
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 11 May 2011 16:30:15 +0000 (17:30 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 11 May 2011 16:30:15 +0000 (17:30 +0100)

Trivial merge