Merge branch 'master' into harmattan
authorLucian Horga <lucian@esdhcp042115.research.nokia.com>
Wed, 23 Mar 2011 17:52:28 +0000 (19:52 +0200)
committerLucian Horga <lucian@esdhcp042115.research.nokia.com>
Wed, 23 Mar 2011 17:52:28 +0000 (19:52 +0200)
commit3df9e5cb58f988ca58c9b5bb6c3656f4eabf15b9
tree13ccf84fbbfe0aa3f5d3dbdcd106cb6ac616d9fc
parentf89914015f3718423897f386108666300003fc06
parentdcb92c529ff2054d3880e3625d1ca6e89165f57f
Merge branch 'master' into harmattan