Merge branch 'master' into harmattan
authorLucian Horga <lucian@esdhcp042115.research.nokia.com>
Fri, 17 Dec 2010 14:58:59 +0000 (16:58 +0200)
committerLucian Horga <lucian@esdhcp042115.research.nokia.com>
Fri, 17 Dec 2010 14:58:59 +0000 (16:58 +0200)
commitba7a2cae6116575af664659e74631ed37eb4160c
tree0007e0bea1fdc27753fdb163ffcf2dd4553d542b
parent97cfd0c41a11ecb2a41a05a38208ad6e2925a5c7
parent29ef119245d14e630cc808c9d5d8c2a68790b022
Merge branch 'master' into harmattan