Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Fri, 30 Jul 2010 11:31:49 +0000 (14:31 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Fri, 30 Jul 2010 11:31:49 +0000 (14:31 +0300)
commit058e711638f32c02e127b8b1b40083fd369029b2
treefc51d15613bbc14861ce68bba2eb904635ef0245
parent541f364c709117401c3633eac25160eb38160726
parent0ce9b902dcf119c80a93466f5562cf658ffb1542
Merge branch 'master' into harmattan