Merge branch 'master' of http://darcs.haskell.org/testsuite
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 21 Dec 2012 11:02:48 +0000 (11:02 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 21 Dec 2012 11:02:48 +0000 (11:02 +0000)

Trivial merge