Merge commit 'origin/opendreambox-1.6' into vuplus-1.6

Conflicts:

	recipes/base-files/base-files_3.0.14.bb
	recipes/enigma2/enigma2.bb
	recipes/gstreamer/gst-plugins-bad_0.10.19.bb

diff --cc recipes/base-files/base-files_3.0.14.bb
index aabba45,7839d70..92c61b4
mode 100755,100644..100755
--- 1/recipes/base-files/base-files_3.0.14.bb
--- 2/recipes/base-files/base-files_3.0.14.bb
+++ b/recipes/base-files/base-files_3.0.14.bb

diff --cc recipes/enigma2/enigma2.bb
index 59e7b96,ad56872..ece2e20
mode 100644,100755..100644
--- 1/recipes/enigma2/enigma2.bb
--- 2/recipes/enigma2/enigma2.bb
+++ b/recipes/enigma2/enigma2.bb
@@@ -61,8 -60,7 +61,8 @@@ DESCRIPTION_append_enigma2-plugin-syste
  PN = "enigma2"
  PR = "r0"
  
- SRCDATE = "20100727"
+ SRCDATE = "20100728"
 +SRCDATE_vuplus = "20100727"
  #SRCDATE is NOT used by git to checkout a specific revision
  #but we need it to build a ipk package version
  #when you like to checkout a specific revision of e2 you need

diff --cc recipes/gstreamer/gst-plugins-bad_0.10.19.bb
index 452b185,d99f486..b2993a8
--- 1/recipes/gstreamer/gst-plugins-bad_0.10.19.bb
--- 2/recipes/gstreamer/gst-plugins-bad_0.10.19.bb
+++ b/recipes/gstreamer/gst-plugins-bad_0.10.19.bb
@@@ -9,12 -9,10 +9,14 @@@ do_configure_prepend() 
  DEPENDS += "gst-plugins-base"
  
  EXTRA_OECONF_opendreambox += "--disable-apexsink --disable-dvdnav --disable-cdaudio --disable-mpeg2enc --disable-mplex"
 +EXTRA_OECONF_vuplus += "--disable-apexsink --disable-dvdnav --disable-cdaudio --disable-mpeg2enc --disable-mplex"
  
  SRC_URI_append_opendreambox += " file://mpegpsdemux_speedup.diff;patch=1;pnum=0 \
-                                file://mpegtsdemux_fix_ac3_detection.diff;patch=1;pnum=0"
+                                file://mpegtsdemux_fix_ac3_detection.diff;patch=1;pnum=0 \
+                                file://aacparse-fix-rank.diff;patch=1;pnum=1"
 +SRC_URI_append_vuplus += " file://mpegpsdemux_speedup.diff;patch=1;pnum=0 \
-                                file://mpegtsdemux_fix_ac3_detection.diff;patch=1;pnum=0"
++                               file://mpegtsdemux_fix_ac3_detection.diff;patch=1;pnum=0 \
++                               file://aacparse-fix-rank.diff;patch=1;pnum=1"
  
  RCONFLICTS_gst-plugin-mpegdemux = "gst-plugin-fluendo-mpegdemux"
  RREPLACES_gst-plugin-mpegdemux = "gst-plugin-fluendo-mpegdemux"

diff --cc recipes/klibc/klibc_1.5.15.inc
Simple merge

diff --cc recipes/sysvinit/sysvinit_2.86.bb
index 8daae0e,1b8da7e..6b6d9ae
mode 100755,100644..100755
--- 1/recipes/sysvinit/sysvinit_2.86.bb
--- 2/recipes/sysvinit/sysvinit_2.86.bb
+++ b/recipes/sysvinit/sysvinit_2.86.bb

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