Merge branch 'master' into harmattan
authorLucian Horga <lucian@esdhcp042115.research.nokia.com>
Fri, 17 Dec 2010 11:44:01 +0000 (13:44 +0200)
committerLucian Horga <lucian@esdhcp042115.research.nokia.com>
Fri, 17 Dec 2010 11:44:01 +0000 (13:44 +0200)
commit21465f947692fd8986eca5dfae2b8cc96fc9d5d3
treef78c6d842165341bef5ef0a0d7c08d62d428cfe9
parent8d55763669c7933737adf9f14616c263fe44c421
parentc69ed23483022e5e123146ada8e3860e4939c9d4
Merge branch 'master' into harmattan