Merge the conflict
[vuplus_openembedded] / opie-addressbook / opie-addressbook_1.1.7.oe