Merge branch 'master' into testsuite-work * master: maintcheck: fix some more failures maintcheck: fix some failures, extend some checks
2011-06-02T12:54:03