Merge branch 'vuplus-1.6' of origin into vuplus-1.6
authorschon <schon@dev03-server>
Mon, 21 Mar 2011 12:02:13 +0000 (21:02 +0900)
committerschon <schon@dev03-server>
Mon, 21 Mar 2011 12:02:13 +0000 (21:02 +0900)
commit78e8f7381a692be4bf51b47ba9c7ad50c9861494
treef14698e778a6a70a4b78b4c7d8a5a5c35346f659
parent7fe7393abc7bebcfe458c77a08630bffcc96fe40
parent1ed03558cca8376c439e641ef7db89e809e31ef1
Merge branch 'vuplus-1.6' of origin into vuplus-1.6

Conflicts:
recipes/enigma2/enigma2-plugins.bb
recipes/vuplus/vuplus-dvb-modules.bb
recipes/enigma2/enigma2.bb
recipes/libdreamdvd/libdreamdvd.bb
recipes/udev/udev_124.bb
recipes/vuplus/vuplus-dvb-modules.bb