Resolve a conflict
Resolve a conflict

deztructor/meegotouch-controlpanelapplets,nemomobile-graveyard/meegotouch-controlpanelapplets,deztructor/meegotouch-controlpanelapplets,nemomobile-graveyard/meegotouch-controlpanelapplets,deztructor/meegotouch-controlpanelapplets,nemomobile-graveyard/meegotouch-controlpanelapplets