Merge branch 'opendreambox' of git://git.opendreambox.org/git/openembedded into opend...

Merge branch 'opendreambox' of git://git.opendreambox.org/git/openembedded into opendreambox

Conflicts:
	conf/checksums.ini
	packages/busybox/busybox-1.11.3/dhcp-hostname.patch
	packages/busybox/busybox-1.11.3/hdparm_M.patch
	packages/busybox/busybox-1.11.3/keymap_endianess.patch
	packages/busybox/busybox_1.13.2.bb
	packages/busybox/files/dhcp-hostname.patch
	packages/busybox/files/hdparm_M.patch
	packages/busybox/files/keymap_endianess.patch
	packages/gstreamer/gst-plugins-base_0.10.21.bb
	packages/gstreamer/gst-plugins-base_0.10.22.bb
	packages/gstreamer/gst-plugins-good_0.10.11.bb
	packages/gstreamer/gst-plugins-good_0.10.14.bb
	recipes/busybox/busybox-1.11.3/dhcp-hostname.patch
	recipes/busybox/busybox-1.11.3/hdparm_M.patch
	recipes/busybox/busybox-1.11.3/keymap_endianess.patch
	recipes/busybox/busybox-1.11.3/nptl_task.patch
	recipes/enigma2/enigma2/enigma2-disable-iframesearch.patch
	recipes/gstreamer/gst-plugin-fluendo-mpegdemux_0.10.15.bb
	recipes/gstreamer/gst-plugins-bad_0.10.8.bb
	recipes/gstreamer/gst-plugins-bad_0.10.9.bb
	recipes/gstreamer/gst-plugins-base_0.10.20.bb
	recipes/gstreamer/gst-plugins-base_0.10.21.bb
	recipes/gstreamer/gst-plugins-good
	recipes/gstreamer/gst-plugins-good_0.10.11.bb
	recipes/gstreamer/gst-plugins-ugly_0.10.9.bb
	recipes/gstreamer/gstreamer_0.10.20.bb
	recipes/tuxbox/files/nolibtuxbox.diff