Merge the conflict
[vuplus_openembedded] / opie-bluetoothmanager / opie-bluetoothmanager_1.1.7.oe