Merge branch 'master' into harmattan
authorAlexander Akimov <ext-alexander.akimov@nokia.com>
Fri, 4 Nov 2011 14:09:17 +0000 (16:09 +0200)
committerAlexander Akimov <ext-alexander.akimov@nokia.com>
Fri, 4 Nov 2011 14:09:17 +0000 (16:09 +0200)
commit3081a964c17f2354d1ba4fa2cd43afc182be7dee
tree406294efc603de4a989b276e039981c2046c7aaf
parentde38c935bc4408b21b94158ed78409fcc339f6e0
parent9a132b7d11b47b73a5f526bc125433c318e975a3
Merge branch 'master' into harmattan

Conflicts:
common-vars.pri
common-vars.pri