Merge branch 'opendreambox' of git://git.ritzmo.de/openembedded into opendreambox

Conflicts:

	packages/dvd+rw-tools/dvd+rw-tools_7.0.bb
	packages/libdreamdvd/libdreamdvd.bb
	packages/mjpegtools/mjpegtools_1.9.0rc3.bb

diff --combined packages/libcdio/libcdio_0.80.bb
index caf7670,1514b9e..0c9ea52
--- 1/packages/libcdio/libcdio_0.80.bb
--- 2/packages/libcdio/libcdio_0.80.bb
+++ b/packages/libcdio/libcdio_0.80.bb
@@@ -5,7 -5,6 +5,7 @@@ PRIORITY = "optional
  LICENSE = "GPL"
  MAINTAINER = "Andreas Frisch <andreas.frisch@multimedia-labs.de>"
  PR="r1"
 +DEPENDS = "libcddb"
  
  SRC_URI = "http://ftp.gnu.org/pub/gnu/libcdio/${PN}-${PV}.tar.gz\
            file://${PN}-${PV}-configure-crosscompile.patch;patch=1\
@@@ -17,8 -16,7 +17,7 @@@ inherit pkgconfig autotool
  
  EXTRA_OECONF="--enable-cddb --disable-cpp-progs --disable-vcd-info --disable-maintainer-mode --without-cd-paranoia --without-cdda-player --disable-cxx --disable-example-progs --disable-joliet --without-cd-drive --without-cd-read --without-iso-info --without-iso-read --without-cd-info"
  
- RDEPEND = "cddb? ( >=media-libs/libcddb-1.0.1 ) virtual/libintl"
- DEPEND = "sys-devel/gettext dev-util/pkgconfig"
+ DEPENDS = "libcddb virtual/libintl"
  
  do_compile_append () {
        install -d ${D}${bindir}