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)
commit2d133b85e1edd9501e48050e16fe6e988007985d
treeef86c93656bace66475975828b5c2f2d7d8314b3
parent9b7ecceae9e32a78f58f36e9666f9798f825b31f
parent7e73c54e8ad1521d0fc881213dd829a1201f41c1
Merge branch 'vuplus-1.6' of ssh://192.168.102.66/~ikseong/work/repo/openembedded into vuplus-1.6

Conflicts:
conf/distro/vuplus.conf
recipes/vuplus/vuplus-dvb-modules.bb