merging with master
authorAlexander Akimov <ext-alexander.akimov@nokia.com>
Mon, 5 Sep 2011 10:48:55 +0000 (13:48 +0300)
committerAlexander Akimov <ext-alexander.akimov@nokia.com>
Mon, 5 Sep 2011 10:48:55 +0000 (13:48 +0300)
commit84c4bf5a6d78d89352f22d653d7ad73eb8cf492b
tree6e4bc66f5732b5d35c13559302ae33613287b759
parentdd69b4dc3778892820840abac1903c55970d7c7c
merging with master
src/signond/pluginproxy.cpp
src/signond/signonauthsession.cpp