Merge branch 'vuplus-1.6' of ssh://192.168.102.66/~ikseong/work/repo/openembedded...
authorschon <schon@dev03-server>
Mon, 19 Jul 2010 06:49:32 +0000 (15:49 +0900)
committerschon <schon@dev03-server>
Mon, 19 Jul 2010 06:49:32 +0000 (15:49 +0900)
Conflicts:
recipes/vuplus/vuplus-dvb-modules.bb

1  2 
recipes/vuplus/vuplus-dvb-modules.bb

Simple merge