Merge the conflict
[vuplus_openembedded] / opie-sshkeys / opie-sshkeys_1.1.7.oe