Merge branch 'vuplus-1.6' of ssh://192.168.102.66/~ikseong/work/repo/openembedded...
authorschon <schon@dev03-server>
Tue, 12 Oct 2010 06:10:25 +0000 (15:10 +0900)
committerschon <schon@dev03-server>
Tue, 12 Oct 2010 06:10:25 +0000 (15:10 +0900)
Conflicts:
conf/distro/vuplus.conf
recipes/vuplus/vuplus-dvb-modules.bb


Trivial merge