Merge the conflict
[vuplus_openembedded] / opie-batteryapplet / opie-batteryapplet_1.1.7.oe