Merge branch 'master' into harmattan
authorTomi Suviola <tomi.suviola@nokia.com>
Wed, 15 Sep 2010 12:03:57 +0000 (15:03 +0300)
committerTomi Suviola <tomi.suviola@nokia.com>
Wed, 15 Sep 2010 12:03:57 +0000 (15:03 +0300)
commiteca248677f44ec6fc1de3382823952e1919b57c0
treebdd7ccb6e23b161b3731cfb3bc6ebd83ae77f5c3
parent1f6d7e050077c221096626ed996b9162218dd5c4
parentd17b1d191c80824f7f675cf1fbf6b13eb7fd99ac
Merge branch 'master' into harmattan