Merge branch 'master' of git.blackhole-community.net:repos/bh/openblackhole-oe-core Conflicts: meta-vuplus [DH] bitbake [DH] meta-openembedded [DH] meta-vuplus-bh/recipes-drivers/vuplus-dvb-modules.inc [DH] meta-xp [DH] openembedded-core...