merge some changes from gnome-panel/master