Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Tue, 26 Jul 2011 12:08:34 +0000 (15:08 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Tue, 26 Jul 2011 12:08:34 +0000 (15:08 +0300)
commit227e82002d2ea870c854624a5ea1899210f9f905
treef1d2663642c0645507a061f8a01f69753c8d8ccb
parenta0913273f11485d5ecffcff1dbae853ffe0a8c33
parentb5020b696f0b7e8a539003841120d83cf49c5176
Merge branch 'master' into harmattan

Conflicts:
common-vars.pri