Merge branch 'harmattan'
authorTomi Suviola <tomi.suviola@nokia.com>
Fri, 30 Sep 2011 12:23:29 +0000 (15:23 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Fri, 30 Sep 2011 12:23:29 +0000 (15:23 +0300)
commit603e1a98a658fce2e2ece56a38342bf73f6802c6
tree08f18cf11626231f81145e74bd81b08486fc2c1d
parentbeb0be6e45e3b18178706611c531d0a3e5cf849f
parentfebe86b4632930daf4f9e2eb1b3d25731b524e14
Merge branch 'harmattan'

Conflicts:
common-vars.pri
lib/AccountsUI/basic-item-widget.cpp