Merge branch 'master' into harmattan
authorLucian Horga <lucian@esdhcp042115.research.nokia.com>
Mon, 24 Jan 2011 09:36:47 +0000 (11:36 +0200)
committerLucian Horga <lucian@esdhcp042115.research.nokia.com>
Mon, 24 Jan 2011 09:36:47 +0000 (11:36 +0200)
commit05406b6da241e10294d201d89e2e09bcc5437a3d
tree0db84c3ff3a38fc24357fac28a9200ae314e4191
parent7c465af701c75c108be1dc47cb87dea19ce1773f
parent5be62fea248cd2934ea07a95ae27c965a68b4350
Merge branch 'master' into harmattan