Merge branch 'opendreambox-1.6' into vuplus-1.6
authorikseong <ikseong@vuplus>
Fri, 16 Jul 2010 01:37:06 +0000 (10:37 +0900)
committerikseong <ikseong@vuplus>
Fri, 16 Jul 2010 01:37:06 +0000 (10:37 +0900)
commit4f85beec5bf455c25c588e363c8fb2c6d4912443
treefd74903e38cb872d98b2574b59b9877c592f3981
parentcd7b3a4768db5362eec369b7db06cb8c7652d9e7
parent6df114f33d1683c7a55df00220364100c98b873d
Merge branch 'opendreambox-1.6' into vuplus-1.6

Conflicts:

recipes/gnome/libsoup-2.4_2.29.5.bb
recipes/gstreamer/gst-plugins-base_0.10.29.bb
recipes/gstreamer/gst-plugins.inc
recipes/enigma2/enigma2.bb
recipes/gnome/libsoup-2.4_2.29.5.bb
recipes/gstreamer/gst-plugins-base_0.10.29.bb
recipes/gstreamer/gst-plugins-ugly_0.10.15.bb
recipes/gstreamer/gst-plugins.inc