Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Thu, 20 Oct 2011 08:33:34 +0000 (11:33 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Thu, 20 Oct 2011 08:33:34 +0000 (11:33 +0300)
commit483db9cd02d06d700fb3d185365ee8083763157d
tree231f6826adb55385f88e4091ddcfe536af630bbd
parent0aed88c0d8f9aa500bfde2d4ccfb9dc0c1f41fdd
parent51d6ad1a23fcfd7074f422d4bc0768eb7163865c
Merge branch 'master' into harmattan
common-vars.pri