--- a/jdk/src/solaris/classes/sun/awt/X11/XFontPeer.java	Tue Jan 06 13:52:03 2009 -0800
+++ b/jdk/src/solaris/classes/sun/awt/X11/XFontPeer.java	Mon Jan 12 16:02:47 2009 -0800
@@ -27,9 +27,6 @@
 import sun.awt.PlatformFont;
 import java.awt.GraphicsEnvironment;
 
-/* FIX ME */
-import sun.awt.motif.MFontConfiguration;
-
 public class XFontPeer extends PlatformFont {
 
     /*
@@ -51,10 +48,6 @@
 
     public XFontPeer(String name, int style){
         super(name, style);
-
-        if (fontConfig != null){
-            xfsname = ((MFontConfiguration) fontConfig).getMotifFontSet(familyName, style);
-        }
     }
 
     protected char getMissingGlyphCharacter() {

--- a/jdk/src/solaris/classes/sun/font/FcFontConfiguration.java	Tue Jan 06 13:52:03 2009 -0800
+++ b/jdk/src/solaris/classes/sun/font/FcFontConfiguration.java	Mon Jan 12 16:02:47 2009 -0800
@@ -173,7 +173,7 @@
 
     @Override
     public FontDescriptor[] getFontDescriptors(String fontName, int style) {
-        throw new InternalError("Not implemented");
+        return new FontDescriptor[0];
     }
 
     @Override