Merge the conflict
[vuplus_openembedded] / opie-helpbrowser / opie-helpbrowser_1.1.7.oe