Merge the conflict
[vuplus_openembedded] / opie-examples-python / opie-examples-python_1.1.7.oe