[Bug 225830] Merge Review: gnome-pilot