Merge branch 'master' into harmattan harmattan/0.28
authorLucian Horga <lucian@esdhcp042115.research.nokia.com>
Mon, 29 Nov 2010 16:47:51 +0000 (18:47 +0200)
committerLucian Horga <lucian@esdhcp042115.research.nokia.com>
Mon, 29 Nov 2010 16:47:51 +0000 (18:47 +0200)
commit89970ef813e00f98412d464bffbb58f5421d2172
tree93e7bbe776fa9db34a5a0a5c52d3d0267ec81d70
parentb2d81d1e433de4ae4aa5498c4c2da51badcc6fff
parent48b91dbdf90f1888810e10a943824005a98c7d27
Merge branch 'master' into harmattan

Conflicts:
common-vars.pri
lib/AccountsUI/genericaccountsetupformview.cpp
debian/changelog