Merge branch 'master' of http://darcs.haskell.org/testsuite
authorDimitrios.Vytiniotis <dimitris@microsoft.com>
Wed, 4 Apr 2012 16:04:07 +0000 (17:04 +0100)
committerDimitrios.Vytiniotis <dimitris@microsoft.com>
Wed, 4 Apr 2012 16:04:07 +0000 (17:04 +0100)

Trivial merge