fixed conflicts
[meabook] / maemo /
2010-06-18 Max Usachevadded lost icons
2010-06-16 Max Usachevcorrected OSSO context
2010-06-16 Max Usachevadded setup scripts