Merge branch 'master' of https://github.com/ghc/testsuite
authorJohan Tibell <johan.tibell@gmail.com>
Wed, 12 Sep 2012 15:33:22 +0000 (17:33 +0200)
committerJohan Tibell <johan.tibell@gmail.com>
Wed, 12 Sep 2012 15:33:22 +0000 (17:33 +0200)

Trivial merge