--- a/usr/src/java/util/org/opensolaris/os/vp/util/misc/Finder.java	Mon Jan 11 14:14:30 2010 -0500
+++ b/usr/src/java/util/org/opensolaris/os/vp/util/misc/Finder.java	Wed Jan 13 14:14:02 2010 -0500
@@ -20,7 +20,7 @@
  */
 
 /*
- * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -49,6 +49,11 @@
     // Static methods
     //
 
+    public static String getString(ClassLoader loader, String pkg, String key,
+	Object... args) {
+	return mFinder.getString(loader, pkg, key, args);
+    }
+
     public static String getStringFromPackage(
 	String pkg, String key, Object... args) {
 	return mFinder.getStringFromPackage(pkg, key, args);
@@ -58,6 +63,10 @@
 	return mFinder.getString(key, args);
     }
 
+    public static URL getResource(ClassLoader loader, String pkg, String name) {
+	return rFinder.getResource(loader, pkg, name);
+    }
+
     public static URL getResource(String pkg, String name) {
 	return rFinder.getResource(pkg, name);
     }
@@ -66,6 +75,11 @@
 	return rFinder.getResource(name);
     }
 
+    public static ImageIcon getIcon(ClassLoader loader, String pkg, String name)
+    {
+	return iFinder.getIcon(loader, pkg, name);
+    }
+
     public static ImageIcon getIcon(String pkg, String name) {
 	return iFinder.getIcon(pkg, name);
     }

--- a/usr/src/java/vpanels/panel/org/opensolaris/os/vp/panel/common/control/Control.java	Mon Jan 11 14:14:30 2010 -0500
+++ b/usr/src/java/vpanels/panel/org/opensolaris/os/vp/panel/common/control/Control.java	Wed Jan 13 14:14:02 2010 -0500
@@ -20,7 +20,7 @@
  */
 
 /*
- * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
+ * Copyright 2010 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
  */
 
@@ -172,8 +172,9 @@
      * page if the section is invalid.
      */
     protected URL buildHelpURL(String page, String section) {
-	String pkg = getClass().getPackage().getName();
-	URL url = Finder.getResource(pkg, page);
+	Class clazz = getClass();
+	URL url = Finder.getResource(clazz.getClassLoader(),
+	    clazz.getPackage().getName(), page);
 	try {
 	    url = new URL(url, section);
 	} catch (MalformedURLException ignore) {