Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Thu, 11 Nov 2010 13:29:29 +0000 (15:29 +0200)
committerTomi Suviola <tomi.suviola@nokia.com>
Thu, 11 Nov 2010 13:29:29 +0000 (15:29 +0200)
commitc5106c907c6703658bd518136b10564f0edcb4f9
treea27159a2fe009b44dbe67f1e6ea4a1ad9028e03b
parentac11be911abf44392411979211b99f7a4a147ad9
parent2ea8ccc327961c2e8b7480afffdc9a2e53c91564
Merge branch 'master' into harmattan