diff -r e4b6a6d206e6 -r 687d51cb403b langtools/test/tools/javac/T6358166.java
--- a/langtools/test/tools/javac/T6358166.java	Wed Jun 18 07:23:25 2008 -0700
+++ b/langtools/test/tools/javac/T6358166.java	Thu Jun 19 15:52:31 2008 -0700
@@ -33,6 +33,7 @@
 import javax.lang.model.element.*;
 import javax.tools.*;
 import com.sun.tools.javac.file.*;
+import com.sun.tools.javac.file.JavacFileManager; // disambiguate
 import com.sun.tools.javac.main.JavaCompiler;
 import com.sun.tools.javac.main.*;
 import com.sun.tools.javac.util.*;