Merge branch 'master' of http://darcs.haskell.org/testsuite
authorSimon Peyton Jones <simonpj@microsoft.com>
Mon, 5 Sep 2011 07:35:03 +0000 (08:35 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Mon, 5 Sep 2011 07:35:03 +0000 (08:35 +0100)

Trivial merge