Merge branch 'master' of http://darcs.haskell.org//testsuite
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 14 Mar 2012 17:42:20 +0000 (17:42 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 14 Mar 2012 17:42:20 +0000 (17:42 +0000)

Trivial merge