Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Thu, 9 Jun 2011 12:49:15 +0000 (15:49 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Thu, 9 Jun 2011 12:49:15 +0000 (15:49 +0300)
commitb4e1871d488cf20c5f11809f335abeeee5d67a4c
tree22fdd99a7917f4d6abcbd1febda63f40e49491ce
parent514c2a90832dc87546a0ca55ab609c99dc76e37b
parentfa3b51095952815488233f5485e5b893f6f6a6b6
Merge branch 'master' into harmattan

Conflicts:
common-vars.pri