Merge branch 'master' into harmattan harmattan/5.5-1
authorTomi Suviola <tomi.suviola@nokia.com>
Fri, 26 Nov 2010 09:15:27 +0000 (11:15 +0200)
committerTomi Suviola <tomi.suviola@nokia.com>
Fri, 26 Nov 2010 09:15:27 +0000 (11:15 +0200)
commit383537863eef41677d4d5a68d06214ca029b546b
treeed42bef8f139b8192a0026a429f21237c9214553
parente8f63a06b9ae0aa1ae1cdf8e113a06957a8883aa
parente329b15db6235fdba0b9b8ad27c949d1503c02dc
Merge branch 'master' into harmattan