Merge branch 'master' into xmpp

Conflicts:
	Assistant/Threads/NetWatcher.hs

Assistant/Threads/MountWatcher.hs

@@ -74,6 +74,11 @@ dbusThread st dstatus scanremotes pushnotifier =
 			)
 		onerr :: E.SomeException -> IO ()
 		onerr e = do
+			{- If the session dbus fails, the user probably
+			 - logged out of their desktop. Even if they log
+			 - back in, we won't have access to the dbus
+			 - session key, so polling is the best that can be
+			 - done in this situation. -}
 			runThreadState st $
 				warning $ "dbus failed; falling back to mtab polling (" ++ show e ++ ")"
 			pollinstead