Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Thu, 23 Jun 2011 11:12:17 +0000 (14:12 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Thu, 23 Jun 2011 11:12:17 +0000 (14:12 +0300)
commitd5e0879df5c8b5001f70ba0a4449e8b298ed5036
tree8a4c94e0d4ccc860f4ac62d33508c02404a49d5c
parent9d4330091d767f6127b5200b36bb8d77437fb85a
parent39fe520a154189b54d36111de67e7c3ae5e064d4
Merge branch 'master' into harmattan