Merge the conflict
[vuplus_openembedded] / opie-rotateapplet / opie-rotateapplet_1.1.7.oe