merge gnome-keyring support