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

Trivial merge