Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Wed, 27 Jul 2011 12:29:16 +0000 (15:29 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Wed, 27 Jul 2011 12:29:16 +0000 (15:29 +0300)
commitdbd3a01cdf32274081dce8068c7695e76ee1bbf9
tree2e34e4780bfd91076a8c044e0b26ab79253ca5c8
parent2446e9b05964b5376400671327cba9b394fc732e
parent9c4f2d9d2835cf80802b5f321fc47b86974c653e
Merge branch 'master' into harmattan