[Bug 225829] Merge Review: gnome-pilot-conduits