Merge branch 'master' of http://darcs.haskell.org/testsuite
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 16 Sep 2011 15:07:29 +0000 (16:07 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 16 Sep 2011 15:07:29 +0000 (16:07 +0100)

Trivial merge