Merge branch 'master' of https://github.com/ghc/testsuite
authorJohan Tibell <johan.tibell@gmail.com>
Thu, 13 Dec 2012 15:50:12 +0000 (07:50 -0800)
committerJohan Tibell <johan.tibell@gmail.com>
Thu, 13 Dec 2012 15:50:12 +0000 (07:50 -0800)

Trivial merge