Merge branch 'master' of http://darcs.haskell.org/testsuite
authorSimon Peyton Jones <simonpj@microsoft.com>
Mon, 23 Jul 2012 08:18:55 +0000 (09:18 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Mon, 23 Jul 2012 08:18:55 +0000 (09:18 +0100)

Trivial merge