Merge branch 'master' of http://darcs.haskell.org/testsuite
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 9 Mar 2012 13:32:58 +0000 (13:32 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 9 Mar 2012 13:32:58 +0000 (13:32 +0000)

Trivial merge