Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar-toolkit

src/sugar/activity/bundlebuilder.py

@@ -168,7 +168,7 @@ def cmd_dev(config, options, args):
     bundle_path = env.get_user_activities_path()
     if not os.path.isdir(bundle_path):
         os.mkdir(bundle_path)
-    bundle_path = os.path.join(bundle_path, config.bundle_top_dir)
+    bundle_path = os.path.join(bundle_path, config.bundle_root_dir)
     try:
         os.symlink(config.source_dir, bundle_path)
     except OSError:

src/sugar/graphics/palette.py

@@ -246,6 +246,7 @@ class Palette(gtk.Window):
         self._palette_popup_sid = None
         self._enter_invoker_hid = None
         self._leave_invoker_hid = None
+        self._right_click_invoker_hid = None
 
         # we set these for backward compatibility
         if label is not None: