Merge commit 'dm/opendreambox-1.6' into test_0310
authorschon <schon@dev03-server>
Thu, 10 Mar 2011 04:51:16 +0000 (13:51 +0900)
committerschon <schon@dev03-server>
Thu, 10 Mar 2011 04:51:16 +0000 (13:51 +0900)
commit0684eaa15fcd8289900671c269358401b7f752da
tree018073f54cc343b62f2a08bd1ece3b3ce264d747
parent0bdb6a37748ede59f32b332922a3342006ee80b3
parent9eeb56deb669b854d4ade9c0536247e484b4842a
Merge commit 'dm/opendreambox-1.6' into test_0310

Conflicts:
recipes/autofs/autofs_4.1.4.bb
recipes/busybox/busybox_1.15.3.bb
recipes/enigma2/enigma2.bb
recipes/gstreamer/gst-plugin-dvbmediasink.bb
recipes/tasks/task-boot.bb
recipes/udev/udev_124.bb
recipes/autofs/autofs_4.1.4.bb
recipes/busybox/busybox_1.15.3.bb
recipes/enigma2/enigma2-plugins.bb
recipes/enigma2/enigma2.bb
recipes/gstreamer/gst-plugin-dvbmediasink.bb
recipes/gstreamer/gst-plugins.inc
recipes/libdreamdvd/libdreamdvd.bb
recipes/opkg/opkg-nogpg_svn.bb
recipes/udev/udev_124.bb
recipes/vsftpd/vsftpd_2.0.5.bb