Changes: resolve a conflict
Changes: resolve a conflict

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