Merge the conflict
[vuplus_openembedded] / opie-vtapplet / opie-vtapplet_1.1.7.oe