Merge branch 'NB_208268'
authorLucian Horga <lucian@esdhcp042115.research.nokia.com>
Wed, 23 Mar 2011 17:45:02 +0000 (19:45 +0200)
committerLucian Horga <lucian@esdhcp042115.research.nokia.com>
Wed, 23 Mar 2011 17:45:02 +0000 (19:45 +0200)
commitf49aa780340c681b6d4c4f804829da3265a37014
tree0cde45eba457a465b0c33d662bc21bce1dd6c3e1
parent1ea19153e7f412df45dbd87bda1ed6957415fc01
parent626dcb8fef85c2426e5fe1d8b756d9347cb2c753
Merge branch 'NB_208268'
tests/libsignon-qt-tests/ssotestclient.cpp
tests/libsignon-qt-tests/ssotestclient.h