Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Fri, 17 Sep 2010 08:11:27 +0000 (11:11 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Fri, 17 Sep 2010 08:11:27 +0000 (11:11 +0300)
commit2be31df69dbf08d651fb546662635d70b72d80a2
treecd0c16c84075d7be23220e9334b985faa77774be
parent80d38dfd64ad95d6dd849c588d80537718a40c04
parent39c06f8bfc8e0356dcda00af392f347af1cf9260
Merge branch 'master' into harmattan