Merge branch 'harmattan'
authorTomi Suviola <tomi.suviola@nokia.com>
Fri, 30 Sep 2011 12:24:00 +0000 (15:24 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Fri, 30 Sep 2011 12:24:00 +0000 (15:24 +0300)
commit6a2c4a2bc6e3fe6c50a842c7322148064781c225
treeb07e4b12531a855923243c8d5b8ed2e6c39e4983
parent603e1a98a658fce2e2ece56a38342bf73f6802c6
Merge branch 'harmattan'

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