Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Mon, 2 Aug 2010 08:00:37 +0000 (11:00 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Mon, 2 Aug 2010 08:00:37 +0000 (11:00 +0300)
commitf6ef97bfbedae22453ec925f29f434354d4ea9f0
treef7065cd38c524c43ac04db8478b387fe3ee9ec3d
parentdd1ff2676c117fbc863b000216ed89326d14cefc
parent6c999222adffb47075d6ff1d613538719439fb34
Merge branch 'master' into harmattan