Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Wed, 25 May 2011 06:47:50 +0000 (09:47 +0300)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Wed, 25 May 2011 06:47:50 +0000 (09:47 +0300)
commit11c3ca90ebe7c15fe1b344bda858c5faeaffb977
treeb8fdebf747c82ebe5496784278346967169504af
parent01330ea6a6082aded36d8969989bfdcf1cf17c6a
parentbc58b76dbc3cab18048a39fea8439a34b62a6859
Merge branch 'master' into harmattan

Conflicts:

common-vars.pri