Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Fri, 29 Apr 2011 10:55:09 +0000 (13:55 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Fri, 29 Apr 2011 10:55:09 +0000 (13:55 +0300)
commit566eb46a4eea758a83cbd1072d63d784d26c27bd
treed2e91bf2e6afc609d89499235fa1aa61fef875bc
parenta4686760691b4eb8249c7a773b3d4f3ec0ab3513
parent9d60e6a6042ae9b181f37c142629ae08e2b396e1
Merge branch 'master' into harmattan

Conflicts:
common-vars.pri