Merge commit 'origin/opendreambox-1.6' into vuplus-1.6
authorikseong <ikseong@vuplus>
Fri, 27 Aug 2010 05:59:17 +0000 (14:59 +0900)
committerikseong <ikseong@vuplus>
Fri, 27 Aug 2010 05:59:17 +0000 (14:59 +0900)
commitbaf0a2634799ec44547bbef2c88fcbc01ef7ce7b
treee4dfe835068a90c0720545756740f18690be35be
parent6cd0a214950b72c96c27f598b6907d64494c1178
parent6813eff92b61242dfc5742257f91e8cbf9eedfbd
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
recipes/base-files/base-files_3.0.14.bb
recipes/enigma2/enigma2.bb
recipes/gstreamer/gst-plugins-bad_0.10.19.bb
recipes/klibc/klibc_1.5.15.inc
recipes/sysvinit/sysvinit_2.86.bb
recipes/udev/udev_124.bb