[Bug 412719] Backport from svn for gnome-panel