Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Mon, 18 Apr 2011 07:06:04 +0000 (10:06 +0300)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Mon, 18 Apr 2011 07:06:04 +0000 (10:06 +0300)
commit0b96bb54ab1f66451c991e53cfd6f180ba286730
treebd06635c0ae5653a607b38a22290333678b709e8
parent5713e2935f08588a4882fcabd0c858ada9367399
parent3619d3abdb4764a04ff9d690371ca800511b0e24
Merge branch 'master' into harmattan