Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Tue, 26 Jul 2011 12:31:12 +0000 (15:31 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Tue, 26 Jul 2011 12:31:12 +0000 (15:31 +0300)
commitc7d1fd8553fc829ae12b6bb5624ecfe110d9c622
treed5f54535acf29d1826c6bca8185d4d32191854b2
parentd945a67670b519a342ffa87c37e049b69557a64c
parentb36debcc89b43b622aec874d5674a6ac2ce6faaa
Merge branch 'master' into harmattan

Conflicts:
common-vars.pri