Merge branch 'master' into harmattan
authorDominic Velikakath <dominic.velikakath@nokia.com>
Thu, 10 Feb 2011 10:18:52 +0000 (15:48 +0530)
committerDominic Velikakath <dominic.velikakath@nokia.com>
Thu, 10 Feb 2011 10:18:52 +0000 (15:48 +0530)
commit5cd041b4be7d99f151994cb05cd26c033a498298
treec7785a3a65c6b80d13cb827ac7c0d7e3deddfdd2
parent26db5f893d8fe5d3837029c899fc3216c92e3361
parentb7dab8ac08f998923b2d0191f7edadce8e1abb09
Merge branch 'master' into harmattan
lib/AccountsUI/service-settings-widget.h