Merge ../../HEAD/testsuite
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 20 Jul 2012 18:12:04 +0000 (19:12 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 20 Jul 2012 18:12:04 +0000 (19:12 +0100)

Trivial merge