Merge branch 'master' of http://darcs.haskell.org/testsuite
authorSimon Peyton Jones <simonpj@microsoft.com>
Sat, 23 Jul 2011 12:27:49 +0000 (13:27 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Sat, 23 Jul 2011 12:27:49 +0000 (13:27 +0100)

Trivial merge