Merge branch 'opendreambox-1.6' into vuplus-1.6

Conflicts:

	recipes/enigma2/enigma2.bb

diff --cc recipes/enigma2/enigma2.bb
index b571996,fbbee99..2453e78
mode 100644,100755..100644
--- 1/recipes/enigma2/enigma2.bb
--- 2/recipes/enigma2/enigma2.bb
+++ b/recipes/enigma2/enigma2.bb
@@@ -22,10 -22,8 +22,12 @@@ RDEPENDS_append_dm8000 = " gst-plugin-a
  RDEPENDS_append_dm800 = " gst-plugin-alsa alsa-conf gst-plugin-matroska gst-plugin-qtdemux  gst-plugin-ivorbisdec"
  RDEPENDS_append_dm500hd = " gst-plugin-alsa alsa-conf gst-plugin-avi gst-plugin-matroska \
        gst-plugin-qtdemux gst-plugin-cdxaparse gst-plugin-cdio gst-plugin-vcdsrc gst-plugin-vorbis"
 +RDEPENDS_append_vusolo = " gst-plugin-alsa alsa-conf gst-plugin-avi gst-plugin-matroska \
 +      gst-plugin-qtdemux gst-plugin-cdxaparse gst-plugin-cdio gst-plugin-vcdsrc gst-plugin-vorbis"
 +RDEPENDS_append_bm750 = " gst-plugin-alsa alsa-conf gst-plugin-avi gst-plugin-matroska \
 +      gst-plugin-qtdemux gst-plugin-cdxaparse gst-plugin-cdio gst-plugin-vcdsrc gst-plugin-vorbis"
+ RDEPENDS_append_dm800se = " gst-plugin-alsa alsa-conf gst-plugin-avi gst-plugin-matroska \
+       gst-plugin-qtdemux gst-plugin-cdxaparse gst-plugin-cdio gst-plugin-vcdsrc gst-plugin-vorbis"
  
  # 'forward depends' - no two providers can have the same PACKAGES_DYNAMIC, however both
  # enigma2 and enigma2-plugins produce enigma2-plugin-*.

diff --cc recipes/libdreamdvd/libdreamdvd.bb
index 7700876,a8bea37..6a98402
mode 100755,100644..100755
--- 1/recipes/libdreamdvd/libdreamdvd.bb
--- 2/recipes/libdreamdvd/libdreamdvd.bb
+++ b/recipes/libdreamdvd/libdreamdvd.bb
@@@ -14,10 -14,9 +14,11 @@@ SRCDATE_dm7025 = "20090517
  SRC_URI="cvs://anonymous@cvs.schwerkraft.elitedvb.net/cvsroot/libdreamdvd;module=libdreamdvd;method=pserver"
  
  CFLAGS_dm500hd_append = " -DHARDWARE_SUPPORT_LPCM"
+ CFLAGS_dm800se_append = " -DHARDWARE_SUPPORT_LPCM"
  CFLAGS_dm8000_append = " -DHARDWARE_SUPPORT_LPCM"
  #CFLAGS_dm800_append = " -DHARDWARE_SUPPORT_LPCM"
 +CFLAGS_vusolo_append = " -DHARDWARE_SUPPORT_LPCM"
 +CFLAGS_bm750_append = " -DHARDWARE_SUPPORT_LPCM"
  
  S = "${WORKDIR}/libdreamdvd"
  

diff --cc recipes/tuxbox/tuxbox-libtuxtxt.bb
index d5bbf96,e31847f..81020e2
mode 100755,100644..100755
--- 1/recipes/tuxbox/tuxbox-libtuxtxt.bb
--- 2/recipes/tuxbox/tuxbox-libtuxtxt.bb
+++ b/recipes/tuxbox/tuxbox-libtuxtxt.bb

diff --cc recipes/udev/udev_124.bb
index b837b66,9b9c511..41868c4
mode 100755,100644..100755
--- 1/recipes/udev/udev_124.bb
--- 2/recipes/udev/udev_124.bb
+++ b/recipes/udev/udev_124.bb