diff -r c35b158e2290 -r 6f0ed5a89c25 test/tools/javac/generics/inference/6315770/T6315770.out
--- a/test/tools/javac/generics/inference/6315770/T6315770.out	Tue Apr 10 23:19:26 2012 -0700
+++ b/test/tools/javac/generics/inference/6315770/T6315770.out	Wed Apr 11 10:50:11 2012 +0100
@@ -1,3 +1,3 @@
 T6315770.java:16:42: compiler.err.prob.found.req.1: (compiler.misc.undetermined.type: <T>T6315770<T>, (compiler.misc.no.unique.maximal.instance.exists: T, java.lang.String,java.lang.Integer,java.lang.Runnable))
-T6315770.java:17:40: compiler.err.prob.found.req.1: (compiler.misc.infer.no.conforming.instance.exists: T, T6315770<T>, T6315770<? super java.lang.String>)
+T6315770.java:17:40: compiler.err.prob.found.req.1: (compiler.misc.invalid.inferred.types: T, (compiler.misc.inferred.do.not.conform.to.lower.bounds: java.lang.Integer&java.lang.Runnable, java.lang.String))
 2 errors