[commit: testsuite] overlapping-tyfams: Merge branch 'master' into overlapping-tyfams (2858b49)

[Richard Eisenberg]

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

On branch  : overlapping-tyfams

https://github.com/ghc/testsuite/commit/2858b49638aee6123b142fdb11f6504318c79a0d

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

commit 2858b49638aee6123b142fdb11f6504318c79a0d
Merge: 198b2b8... 083397f...
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Tue May 28 10:05:23 2013 +0100

    Merge branch 'master' into overlapping-tyfams

 tests/deriving/should_run/T7931.hs     |    7 +++++++
 tests/deriving/should_run/T7931.stderr |    1 +
 tests/deriving/should_run/all.T        |    1 +
 tests/ghci/scripts/T7627.stdout        |    3 ++-
 tests/ghci/scripts/T7939.hs            |    8 ++++++++
 tests/ghci/scripts/T7939.script        |    3 +++
 tests/ghci/scripts/T7939.stdout        |    4 ++++
 tests/ghci/scripts/all.T               |    1 +
 tests/ghci/scripts/ghci025.stdout      |    4 ++--
 tests/ghci/scripts/ghci027.stdout      |    6 ++++--
 tests/rename/should_fail/T7937.hs      |   10 ++++++++++
 tests/rename/should_fail/T7937.stderr  |    4 ++++
 tests/rename/should_fail/all.T         |    1 +
 13 files changed, 48 insertions(+), 5 deletions(-)