Merge branch 'master' of http://darcs.haskell.org/testsuite
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 8 Feb 2013 18:08:43 +0000 (18:08 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 8 Feb 2013 18:08:43 +0000 (18:08 +0000)

Trivial merge