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

Trivial merge