Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Wed, 7 Sep 2011 08:59:08 +0000 (11:59 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Wed, 7 Sep 2011 08:59:08 +0000 (11:59 +0300)
commitc9c19a20a8afc05cc1f6c747d3b79ddd02ceb70c
tree49af9f1436094b5a93924aa90c3ec1cdf48c5d01
parentfb6b01a7c63ad5763bf6a5ebc0a95cb2ac7882dc
parent3e855f82f8a0a49b8278cf26f0d1ceaa2eb5ca93
Merge branch 'master' into harmattan

Conflicts:
common-vars.pri
lib/SignOn/libsignon-qt.pri
src/signond/signonauthsession.cpp