Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Fri, 7 May 2010 12:45:59 +0000 (15:45 +0300)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Fri, 7 May 2010 12:45:59 +0000 (15:45 +0300)
commita319f1e43b3605b569990414bf7cc7a80e28fc82
tree3bebb05061f5c5049ccb124c8b05facedae08f1d
parentf83cdde69f1a01647d61137e6454a6ef6c1e5a6e
parent87e1275bfa1b28a8742c7b3caa61e6225c1978d0
Merge branch 'master' into harmattan