Merge branch 'master' into harmattan
authorLucian Horga <lucian@esdhcp042115.research.nokia.com>
Tue, 8 Feb 2011 11:56:39 +0000 (13:56 +0200)
committerLucian Horga <lucian@esdhcp042115.research.nokia.com>
Tue, 8 Feb 2011 11:56:39 +0000 (13:56 +0200)
commit893c3b2f052502f49a5c0e789e39691c0417d5c4
treedaea10abe7b3ca13f9e61ec9424d425da022aee4
parent7a37fda6eadb4e85c0c2a9ddef8e8deab807e556
parent69d4ee70e64feb4ae9172e32f9c6f12f11864269
Merge branch 'master' into harmattan

Conflicts:
lib/AccountsUI/accountsettingspage.cpp