Merge the conflict
[vuplus_openembedded] / opie-dvorak / opie-dvorak_1.1.7.oe