Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Fri, 11 Mar 2011 13:49:23 +0000 (15:49 +0200)
committerTomi Suviola <tomi.suviola@nokia.com>
Fri, 11 Mar 2011 13:49:23 +0000 (15:49 +0200)
commit80323a713e9d9ac199eee3b974ba9f0a2348043a
treeece588b157cfde3de89220bf45f6b383c744ba5a
parent28d11a30b6dd5f213841691650b7b3dbdf76e873
parentc9d56506db5709f8f4f7e31c144dda619f536b7c
Merge branch 'master' into harmattan

Conflicts:
common-vars.pri