Merge the conflict
[vuplus_openembedded] / opie-backgammon / opie-backgammon_1.1.7.oe