Merge branch '1' into harmattan
authorLucian Horga <lucian@esdhcp042115.research.nokia.com>
Fri, 22 Oct 2010 13:24:50 +0000 (16:24 +0300)
committerLucian Horga <lucian@esdhcp042115.research.nokia.com>
Fri, 22 Oct 2010 13:24:50 +0000 (16:24 +0300)
commit175fbfe324fee2cbdec08b1ee9c2bb305d93d5cb
tree1e699edfcc8a6655ef4cbc6b14129d08ad3a8fff
parent343315bd5ef77decd722a8c665af110a59abf0f3
parente0782d23799280ee916c4685857077fa50143b54
Merge branch '1' into harmattan