fixes for current changes
Merge branch 'cubiuntu' of https://github.com/scubiedoo/manifests into cubiuntu

Conflicts:
	compile/uboot.sh
	config/uboot.in
preparing further things for xbmc