Merge branch 'alak_storeCredentials'
authorAlexander Akimov <ext-alexander.akimov@nokia.com>
Fri, 16 Apr 2010 07:56:41 +0000 (10:56 +0300)
committerAlexander Akimov <ext-alexander.akimov@nokia.com>
Fri, 16 Apr 2010 07:56:41 +0000 (10:56 +0300)
commit00391abc3ba256dc366a79106494ab090ec6bbd9
tree678524d47a698ec319fc32345c4313623bcab07d
parent36fa7480c9b3a1fe800d700a119d90d7fd645125
parent4780cd287aac9e5312dd4abaca5220c3ba5396a9
Merge branch 'alak_storeCredentials'

Conflicts:
libsignon-glib/signon-identity.c