Merge branch 'set_owner'
authorTomi Suviola <tomi.suviola@nokia.com>
Mon, 6 Jun 2011 08:19:22 +0000 (11:19 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Mon, 6 Jun 2011 08:19:22 +0000 (11:19 +0300)
commit89d10efd8d6dae29499a3b3c288c7fb39026ddb6
tree71ff461afa216c1d540b434d3c55de58fb8687a9
parentc46351ff38fe750b2e18c965af94a20fb1516dbb
parent59b9b6cea892116b44f71502e7eb24f7e18a00c2
Merge branch 'set_owner'

Conflicts:
src/signond/signonidentity.cpp
lib/SignOn/identityimpl.cpp
lib/signond/signoncommon.h
src/signond/signonidentity.cpp