Merge the conflict
[vuplus_openembedded] / opie-screenshotapplet / opie-screenshotapplet_1.1.7.oe