Merge branch 'master' into harmattan
authorAurel Popirtac <ext-aurel.popirtac@nokia.com>
Fri, 20 Jan 2012 11:19:22 +0000 (13:19 +0200)
committerAurel Popirtac <ext-aurel.popirtac@nokia.com>
Fri, 20 Jan 2012 11:19:22 +0000 (13:19 +0200)
commit4bc69b8dbdca02b07d8a983ed01f4dd224977665
tree87c71b692aa605c72752df5febeabb034b682824
parent9520e0aad349238b0b44dd348bd53eb504b2558d
parent04e36cfabe0c85a01d78ce3f8530fac560dd5188
Merge branch 'master' into harmattan
common-vars.pri