diff --recursive -u gnome-session-2.4.0-vanilla/gnome-session/main.c gnome-session-2.4.0/gnome-session/main.c
--- gnome-session-2.4.0-vanilla/gnome-session/main.c	2003-08-13 07:58:52.000000000 -0500
+++ gnome-session-2.4.0/gnome-session/main.c	2003-10-30 17:01:04.000000000 -0600
@@ -481,6 +481,15 @@
 #endif
 }
 
+/* Ensure gconfd-2 is shutdown when a user logs out so the user's $HOME
+ * may be unmounted if appropriate
+ */
+static void gconfd_shutdown (void)
+{
+  char *argv[] = { "gconftool-2", "--shutdown", NULL };
+  gnome_execute_async (NULL, 2, argv);
+}
+
 int
 main (int argc, char *argv[])
 {
@@ -634,6 +643,8 @@
 
   clean_ice ();
 
+  gconfd_shutdown (); /* in case home needs to be unmounted on logout */
+
   /* If a logout command was set, the following will not return */
   execute_logout ();
   
