Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Wed, 1 Sep 2010 10:24:52 +0000 (13:24 +0300)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Wed, 1 Sep 2010 10:24:52 +0000 (13:24 +0300)
commit7e780b6d2a5e1109c67540a6dba69deef93a1e29
treee6dbc25d76941269696587565748e775ecd43a93
parent15040f7ed65e8be2c734df3ad6f3faf608a9c5b4
parent0f830d244a1a0e1c1e18cc8497c085dc43d93527
Merge branch 'master' into harmattan

Conflicts:

common-vars.pri