Merge branch 'master' of http://darcs.haskell.org/testsuite
authorSimon Peyton Jones <simonpj@microsoft.com>
Mon, 8 Aug 2011 08:05:00 +0000 (09:05 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Mon, 8 Aug 2011 08:05:00 +0000 (09:05 +0100)

Trivial merge