Merge branch 'master' into harmattan
authorLucian Horga <lucian@esdhcp042115.research.nokia.com>
Wed, 23 Mar 2011 11:05:21 +0000 (13:05 +0200)
committerLucian Horga <lucian@esdhcp042115.research.nokia.com>
Wed, 23 Mar 2011 11:05:21 +0000 (13:05 +0200)
commit62f83b2591a6c2c637987cc8a2acde04bd93db83
tree52f752197ec0f269e91eba4001f019f9869f26a2
parent4e749f9c2422c9b8498b1cb157cd59d89535d9e7
parentcde0f975a4436019a75062df43f1684edb891530
Merge branch 'master' into harmattan