Merge branch 'master' of http://darcs.haskell.org/testsuite
authorSimon Peyton Jones <simonpj@microsoft.com>
Mon, 9 May 2011 10:38:42 +0000 (11:38 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Mon, 9 May 2011 10:38:42 +0000 (11:38 +0100)

Trivial merge