Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Tue, 22 Mar 2011 14:54:22 +0000 (16:54 +0200)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Tue, 22 Mar 2011 14:54:22 +0000 (16:54 +0200)
commitefe557da867784022ce93ebf25886af389d21741
tree9916751ba8d61a2f8d63f993cf902d69c4f59573
parent18ca33ab9183473714aa7661e44a87f2f43673d1
parent4e276ec23266efd502104379c9923083cd254f7c
Merge branch 'master' into harmattan

Conflicts:

common-vars.pri