Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Tue, 29 Mar 2011 08:45:41 +0000 (11:45 +0300)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Tue, 29 Mar 2011 08:45:41 +0000 (11:45 +0300)
commit8e4c3fad762f535a684a735da7708854b4c5cc36
treeb39e22120a8ebd7c4377aceba85b3c76bd0ead8d
parent298507001db0b546a89d3753cf3ec06a1d4546ed
parented1fb4a629b50987dcf45b0e374f0cb8caba501e
Merge branch 'master' into harmattan

Conflicts:

common-vars.pri