Wibbles to error messages and tests, following ambiguity-check changes
Merge branch 'master' of http://darcs.haskell.org/testsuite

Conflicts:
	tests/simplCore/should_compile/T7360.stderr