[commit: testsuite] master: Merge branch 'master' of darcs.haskell.org:/srv/darcs//testsuite (f4d4997)

[Ian Lynagh]

Repository : ssh://darcs.haskell.org//srv/darcs/testsuite

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/f4d49979b427836e07bea6b4562cbd086b1bbc3f

>---------------------------------------------------------------

commit f4d49979b427836e07bea6b4562cbd086b1bbc3f
Merge: d1a6c78... 5a7e766...
Author: Ian Lynagh <ian at well-typed.com>
Date:   Fri Jan 25 13:35:37 2013 +0000

    Merge branch 'master' of darcs.haskell.org:/srv/darcs//testsuite

 tests/indexed-types/should_compile/T3017.stderr |    2 +-
 tests/polykinds/T5716.stderr                    |    8 +++-----
 tests/polykinds/T7488.hs                        |    2 +-
 tests/typecheck/should_compile/tc231.stderr     |    4 ++--
 tests/typecheck/should_fail/T3468.stderr        |    4 ++--
 5 files changed, 9 insertions(+), 11 deletions(-)