Merge branch 'master' of http://darcs.haskell.org/testsuite
authorSimon Peyton Jones <simonpj@microsoft.com>
Tue, 13 Dec 2011 15:13:51 +0000 (15:13 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Tue, 13 Dec 2011 15:13:51 +0000 (15:13 +0000)

Trivial merge