Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Tue, 26 Jul 2011 11:40:15 +0000 (14:40 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Tue, 26 Jul 2011 11:40:15 +0000 (14:40 +0300)
commit68669eaba9af6eee8e868eb9dce551a1311915f7
tree3031a93dc5933f84516faf0aaf46c01b115d6271
parent298932cb65adfea29e76c2915bd79761a924ac2c
parenta07b15ba3bd3bce28a62c97bcf8a7a4e0dbc362a
Merge branch 'master' into harmattan

Conflicts:
common-vars.pri