Merge commit 'origin/opendreambox-1.6' into vuplus-1.6
authorikseong <ikseong@vuplus>
Wed, 28 Jul 2010 02:48:12 +0000 (11:48 +0900)
committerikseong <ikseong@vuplus>
Wed, 28 Jul 2010 03:06:29 +0000 (12:06 +0900)
commit627a68310528184cbbe32b864c91f7e8ab7f4ff3
treeabd399ebf7d22a6baffaef0aa30e686a3bcd4316
parent1d4f26bb20fb90a157b64b24bfc6e95783968106
parent16ae65722371e29448e142eec818db6079a59f09
Merge commit 'origin/opendreambox-1.6' into vuplus-1.6

modify conf/distro/vuplus.conf, recipes/gstreamer/gst-plugins-base_0.10.30.bb.

Conflicts:

recipes/enigma2/enigma2-plugins.bb
recipes/enigma2/enigma2-skins.bb
recipes/enigma2/enigma2.bb
conf/distro/vuplus.conf
recipes/enigma2/enigma2-plugins.bb
recipes/enigma2/enigma2-skins.bb
recipes/enigma2/enigma2.bb
recipes/gstreamer/gst-plugins-base_0.10.30.bb
recipes/gstreamer/gst-plugins.inc