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

Trivial merge