Merge branch 'vuplus-1.6k_dev' into vuplus-1.6k
authorkos <kos@dev3>
Thu, 29 Nov 2012 10:53:53 +0000 (19:53 +0900)
committerkos <kos@dev3>
Thu, 29 Nov 2012 10:53:53 +0000 (19:53 +0900)
commit06fd5911c3ed792ad0928e38541703764e52dd29
tree7299ab406bed6e77ede29fb9fc8263195ccf0967
parentc05e256b4b7f29135d86edbe2d685a8031122235
parent46b957025a392c05bf4ce388224c04adac92f8c2
Merge branch 'vuplus-1.6k_dev' into vuplus-1.6k

Conflicts:
recipes/enigma2/enigma2.bb
recipes/opera-hbbtv/opera-hbbtv_0.1.bb
recipes/directfb/directfb.inc
recipes/enigma2/enigma2-plugins.bb
recipes/enigma2/enigma2.bb
recipes/images/vuplus-image.bb
recipes/linux-libc-headers/linux-libc-headers_2.6.31.bb
recipes/tuxbox/tuxbox-libtuxtxt.bb
recipes/udev/udev_124.bb
recipes/vuplus/vuplus-dvb-modules.bb