Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Fri, 18 Mar 2011 07:40:44 +0000 (09:40 +0200)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Fri, 18 Mar 2011 07:40:44 +0000 (09:40 +0200)
commit6f22f833621ebc8f95c7c7880519fc762fad7fa0
tree4a03341a8b00ce1c740cbda322b3205ec9d411eb
parentdd0f7b308662adbb621237b6d977827ad6b96986
parent9ecd031d76cb9f442d1f1f453cdfd3a0e9e032e6
Merge branch 'master' into harmattan

Conflicts:

common-vars.pri