Merge branch 'master' of https://github.com/ghc/testsuite
authorJohan Tibell <johan.tibell@gmail.com>
Tue, 8 Jan 2013 02:00:45 +0000 (18:00 -0800)
committerJohan Tibell <johan.tibell@gmail.com>
Tue, 8 Jan 2013 02:00:45 +0000 (18:00 -0800)

Trivial merge