Merge branch 'master' of http://darcs.haskell.org/testsuite
authorSimon Peyton Jones <simonpj@microsoft.com>
Thu, 17 Nov 2011 09:01:37 +0000 (09:01 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Thu, 17 Nov 2011 09:01:37 +0000 (09:01 +0000)

Trivial merge