Merge branch 'master' of http://darcs.haskell.org/testsuite
authorSimon Peyton Jones <simonpj@microsoft.com>
Thu, 21 Jun 2012 14:16:01 +0000 (15:16 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Thu, 21 Jun 2012 14:16:01 +0000 (15:16 +0100)

Trivial merge