Merge branch 'master' into harmattan
authorAlexander Akimov <ext-alexander.akimov@nokia.com>
Thu, 15 Jul 2010 11:54:30 +0000 (14:54 +0300)
committerAlexander Akimov <ext-alexander.akimov@nokia.com>
Thu, 15 Jul 2010 11:54:30 +0000 (14:54 +0300)
commit1dc59f2e50b29bfee7d5b68ab8d17c1423fe1c60
tree5d3d45c73f6ed4ba95bf24f9bcf4bfbc7017ccff
parent824e5f857479a211e8b8c9fdd83abeee00054f69
parent935f932218b727850c71d6d8edae3ace6a368ff1
Merge branch 'master' into harmattan

Conflicts:
common-vars.pri