--- a/usr/src/cmd/radconsole/radconsole.sh	Thu Aug 04 15:32:39 2011 -0700
+++ b/usr/src/cmd/radconsole/radconsole.sh	Fri Aug 05 18:05:53 2011 -0700
@@ -31,8 +31,9 @@
 JAVA_HOME=/usr/jdk/instances/jdk1.6.0
 CLASSPATH="${JAVA_HOME}/lib/jconsole.jar"
 CLASSPATH="${CLASSPATH}:/usr/share/vpanels/vpanels-util.jar"
-CLASSPATH="${CLASSPATH}:/usr/share/vpanels/adr.jar"
-CLASSPATH="${CLASSPATH}:/usr/share/vpanels/rad.jar"
+CLASSPATH="${CLASSPATH}:/usr/lib/rad/java/adr.jar"
+CLASSPATH="${CLASSPATH}:/usr/lib/rad/java/rad.jar"
+CLASSPATH="${CLASSPATH}:/usr/lib/rad/java/afunix.jar"
 URL=service:jmx:radunix:///var/run/radsocket
 
 java -ea -classpath "${CLASSPATH}" sun.tools.jconsole.JConsole "${1:-$URL}"

--- a/usr/src/java/vpanels/panel/org/opensolaris/os/vp/panel/swing/timezone/TimeZonePanel.java	Thu Aug 04 15:32:39 2011 -0700
+++ b/usr/src/java/vpanels/panel/org/opensolaris/os/vp/panel/swing/timezone/TimeZonePanel.java	Fri Aug 05 18:05:53 2011 -0700
@@ -305,6 +305,8 @@
 	List<TZChoice> choices = new LinkedList<TZChoice>();
 	for (TimeZoneInfo zone : infoSet) {
 	    TZChoice choice = new TZChoice(zone);
+	    if (choice.continent_ == null || choice.country_ == null)
+		continue;
 	    choices.add(choice);
 	    nameToTimeZone.put(zone.getName(), choice);
 	    if (zone.getAltName() != null)