Merge branch 'master' into harmattan
authorLucian Horga <lucian@esdhcp042115.research.nokia.com>
Wed, 12 Jan 2011 09:14:01 +0000 (11:14 +0200)
committerLucian Horga <lucian@esdhcp042115.research.nokia.com>
Wed, 12 Jan 2011 09:14:01 +0000 (11:14 +0200)
commitb873df567d787b3654696edec79fc62595f91ee5
treeaf4cbc89a28e97dee663aa94ee96638f7100fb62
parentb5aff3d1f1fe6f79297f97fb94477e51bc768e37
parent9df3678a7f4ddbb3fbbdddd842a379646f97af1b
Merge branch 'master' into harmattan

Conflicts:
common-vars.pri