Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Thu, 23 Sep 2010 07:56:53 +0000 (10:56 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Thu, 23 Sep 2010 07:56:53 +0000 (10:56 +0300)
commit117e06042ea1c66db421ed843680dfd02f97ddb9
tree314a3f034cc10a9da9239e61b8851c2b67373d91
parentacf393906471492660f2c0c448b3fe3560334991
parente74b5196cd5d9561380b24ffdd1ab01163b79e08
Merge branch 'master' into harmattan