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

[Ian Lynagh]

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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/245e63d8c9f9f55a3772614ce2c64a9c77b352c9

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

commit 245e63d8c9f9f55a3772614ce2c64a9c77b352c9
Merge: 38f21bb... 13b32c0...
Author: Ian Lynagh <ian at well-typed.com>
Date:   Wed Jan 16 16:49:53 2013 +0000

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

 tests/indexed-types/should_compile/Gentle.hs |    4 +++-
 tests/indexed-types/should_compile/T7585.hs  |   21 +++++++++++++++++++++
 tests/indexed-types/should_compile/all.T     |    2 +-
 tests/polykinds/T6068.hs                     |    4 +++-
 tests/polykinds/T6068.stdout                 |    3 ++-
 tests/typecheck/should_compile/tc226.hs      |    3 ++-
 tests/typecheck/should_compile/tc235.hs      |    2 +-
 tests/typecheck/should_fail/T5684.hs         |    2 +-
 8 files changed, 34 insertions(+), 7 deletions(-)