Merge branch 'master' into harmattan
authorLucian Horga <lucian@esdhcp042115.research.nokia.com>
Wed, 2 Feb 2011 11:49:26 +0000 (13:49 +0200)
committerLucian Horga <lucian@esdhcp042115.research.nokia.com>
Wed, 2 Feb 2011 11:49:26 +0000 (13:49 +0200)
commitda2b74d523643a3ca5a979844eacc8af24cee282
tree60296bc05236aab45340e6342908070dd4547083
parentcb201bfa5085dca5b5088eaf818b6dce9589ac41
parente8b20c0cd96738ccc0118235b1382f02e98fda09
Merge branch 'master' into harmattan

Conflicts:
common-vars.pri