Fold in testsuite merge fixes.

This commit is contained in:
David Nadlinger
2013-06-14 17:44:08 +02:00
parent eb14970fd0
commit 4f1374e211