Merge branch 'opendreambox-1.6' into vuplus-1.6
authorikseong <ikseong@vuplus>
Thu, 17 Jun 2010 08:17:33 +0000 (17:17 +0900)
committerikseong <ikseong@vuplus>
Thu, 17 Jun 2010 08:17:33 +0000 (17:17 +0900)
commitd084d14102d91bd214f8ce30280b11a291ae4430
treefae35e5ff476881f167d1f8d59ddd9b1f3523cde
parentbc9f150c795666fc268a0d712b36bbc2eec94014
parent0ae80ad0fc8eb82d1f2e4aa882f2d404b8440fe7
Merge branch 'opendreambox-1.6' into vuplus-1.6

Conflicts:

recipes/enigma2/enigma2.bb
recipes/enigma2/enigma2.bb
recipes/libdreamdvd/libdreamdvd.bb
recipes/tuxbox/tuxbox-libtuxtxt.bb
recipes/udev/udev_124.bb