Merge branch 'master' into harmattan
authorSimjees <siabraha@mulimani-desktop.(none)>
Wed, 20 Apr 2011 07:18:04 +0000 (12:48 +0530)
committerSimjees <siabraha@mulimani-desktop.(none)>
Wed, 20 Apr 2011 07:18:04 +0000 (12:48 +0530)
commit0d0c848e2408fb754a6206c8530a0d52ac7eb313
treed90b96b596d7bed3be3b8a16da8287e37b7d4176
parenteb5e218038521873a5e33fbf5f9575d219eaa108
parent1bbe379cc2cb76f23c779fb08ed6e4559b6e91fe
Merge branch 'master' into harmattan

Conflicts:

common-vars.pri
lib/AccountsUI/genericaccountsetupformview.cpp
lib/AccountsUI/genericaccountsetupformview.cpp