Merge ../../HEAD/testsuite
authorSimon Peyton Jones <simonpj@microsoft.com>
Tue, 28 Aug 2012 12:38:18 +0000 (13:38 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Tue, 28 Aug 2012 12:38:18 +0000 (13:38 +0100)

Trivial merge