Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Tue, 2 Nov 2010 09:45:21 +0000 (11:45 +0200)
committerTomi Suviola <tomi.suviola@nokia.com>
Tue, 2 Nov 2010 09:45:21 +0000 (11:45 +0200)
commitc283027fb91cb482f832e15ffc50fed4f638ef8b
treeb6602033c1e00c2247c686a1bba80c94a03e7fa6
parente83281aaec0973534fc72c1984ac9ab5440010e2
parenta80c7a0c37b9ba538fb0df8759dc7efe76a90a15
Merge branch 'master' into harmattan