Merge branch 'master' into harmattan
authorAlberto Mardegan <alberto.mardegan@nokia.com>
Tue, 13 Apr 2010 11:00:24 +0000 (14:00 +0300)
committerAlberto Mardegan <alberto.mardegan@nokia.com>
Tue, 13 Apr 2010 11:00:24 +0000 (14:00 +0300)
commit31647ad4d5c556df65159f5f18673227273889f5
tree89df3977fe03156d4d71069bf8f24750fc0cbe29
parent1c2ade37f9edfe9dfd18f6f6b276669ce715f1c7
parent6fc2c93466fcb59324d277b75e02c52036feec97
Merge branch 'master' into harmattan