Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Thu, 8 Jul 2010 12:32:27 +0000 (15:32 +0300)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Thu, 8 Jul 2010 12:32:27 +0000 (15:32 +0300)
commitcfb9700d9a339cf583cd154f321547e8322414eb
tree91f91c974e6878e916530bc6407ff6d2ac690d82
parent62ea2fe49f55ffb119d08c5ab22b98ef3b410f32
parent6d9f0a2faed63a6a4fe8a443ad14ae3fb3967e17
Merge branch 'master' into harmattan