Merge branch 'master' into harmattan
authorDominic Velikakath <dominic.velikakath@nokia.com>
Wed, 9 Feb 2011 11:43:04 +0000 (17:13 +0530)
committerDominic Velikakath <dominic.velikakath@nokia.com>
Wed, 9 Feb 2011 11:43:04 +0000 (17:13 +0530)
commitd120ac6e0f0cf02f197e203ecb9627149a43e4d2
tree9b77cd6083979b459fc39e6c12c35ee1f8960137
parent634937edb6edef6f6adf184f9e1d386c1fd45337
parentbc334724cca0290892a83faecf08082f94a7fb37
Merge branch 'master' into harmattan
common-vars.pri