[Bug 689606] gnome3: need to rebase 2 g-p-m patches