Gnome keyring support.
Merge branch 'typz-master'

Conflicts:
	keychain_dbus.cpp
	keychain_p.h