gnome-keyring properly
Merging