result of merging with master
authorAlexander Akimov <ext-alexander.akimov@nokia.com>
Mon, 5 Sep 2011 10:41:58 +0000 (13:41 +0300)
committerAlexander Akimov <ext-alexander.akimov@nokia.com>
Mon, 5 Sep 2011 10:41:58 +0000 (13:41 +0300)
commit270bf97b35fd064d81e90414d836873a6c762aa5
treed9fa3787d2ffb065a1130b3a8a5d650a1f1716f2
parent7c505ee0b511f2abc9ae1bc9f44d240c8fcfb9b2
result of merging with master
common-vars.pri
src/example/signonclient.cpp
src/plugins/password/passwordplugin.cpp
src/remotepluginprocess/remotepluginprocess.cpp