Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Thu, 2 Dec 2010 10:02:54 +0000 (12:02 +0200)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Thu, 2 Dec 2010 10:02:54 +0000 (12:02 +0200)
commit8948304de2da56ef4976f41e79254db727f47ee2
tree33544f0bab246cd808fc04e0b5d3802e4a63adf5
parent0bbd770891317870e1e5ebc586813c11c0685793
parent23c7111563be8c2e51ded5c191e4904f515e6cc8
Merge branch 'master' into harmattan

Conflicts:

common-vars.pri