Merge branch 'master' into harmattan
authorLucian Horga <lucian@esdhcp042115.research.nokia.com>
Thu, 16 Dec 2010 10:14:52 +0000 (12:14 +0200)
committerLucian Horga <lucian@esdhcp042115.research.nokia.com>
Thu, 16 Dec 2010 10:14:52 +0000 (12:14 +0200)
commit71f0feef5bc6b2526fc27844cc838dac4bb0200c
treead66b7d2993f5c29afa0ffbbabff8bb7808ed212
parent3ce5fc9e41708ebeb8de740db9cf4b2ef0317b14
parent1883476aa14d2b8ad69df98f8847a5c28e711c65
Merge branch 'master' into harmattan