Merge branch 'master' of https://github.com/ghc/testsuite
authorJohan Tibell <johan.tibell@gmail.com>
Fri, 30 Nov 2012 04:04:29 +0000 (20:04 -0800)
committerJohan Tibell <johan.tibell@gmail.com>
Fri, 30 Nov 2012 04:04:29 +0000 (20:04 -0800)

Trivial merge