Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Tue, 17 May 2011 07:05:07 +0000 (10:05 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Tue, 17 May 2011 07:05:07 +0000 (10:05 +0300)
commit37897b5f25ccf25d3f2881291eafab2dcad2f7f9
tree5e2fb3587d7faa8fdd9d8b87334b06830280584b
parent585925a822d20a16540dbe758921604f82cd18ab
parenta84e4b357f34c20592213efef1a8db6875fd4989
Merge branch 'master' into harmattan