Merge commit 'dm/opendreambox-1.6' into test_1130
authorschon <schon@dev03-server>
Tue, 30 Nov 2010 05:11:10 +0000 (14:11 +0900)
committerschon <schon@dev03-server>
Tue, 30 Nov 2010 05:11:10 +0000 (14:11 +0900)
commit7df6b0791d8f48ca87617b9ef2efe770f9ca6720
treea47fcf78b164fbf8834d7a7175b30971ad9ee49f
parent67c78ef4b5e279ce07172fc04accfa39cc25b0b7
parentda71bfa8b2faa477817dc7806da72f850fac46b9
Merge commit 'dm/opendreambox-1.6' into test_1130

Conflicts:
recipes/aio-grab/aio-grab.bb
recipes/autofs/autofs_4.1.4.bb
recipes/enigma2/enigma2-plugins.bb
recipes/enigma2/enigma2.bb
recipes/opkg/opkg-nogpg_svn.bb
recipes/tuxbox/tuxbox-tuxtxt-32bpp.bb
13 files changed:
recipes/aio-grab/aio-grab.bb
recipes/autofs/autofs_4.1.4.bb
recipes/dreambox/dreambox-blindscan-utils.bb
recipes/enigma2/enigma2-plugins.bb
recipes/enigma2/enigma2.bb
recipes/gstreamer/gst-plugin-dvbmediasink.bb
recipes/libdreamdvd/libdreamdvd.bb
recipes/opkg/opkg-nogpg_svn.bb
recipes/python/python_2.6.4.bb
recipes/sysvinit/sysvinit_2.86.bb
recipes/tuxbox/tuxbox-libtuxtxt.bb
recipes/tuxbox/tuxbox-tuxtxt-32bpp.bb
recipes/udev/udev_124.bb