Merge commit 'dm/opendreambox-1.6' into test_0108
authorschon <schon@dev03-server>
Sat, 8 Jan 2011 07:23:07 +0000 (16:23 +0900)
committerschon <schon@dev03-server>
Sat, 8 Jan 2011 07:23:07 +0000 (16:23 +0900)
commit729547e5434b2415f02292c74acdbac0b8d4af7d
tree25b06ca082c05ceb1bf1f7ec558c9d6c74e5c56b
parent0920da2e0d7d6c76cd79170eceabc46536598178
parenteb2245e8f7574ae1af3227826b0eaa5688ceaf38
Merge commit 'dm/opendreambox-1.6' into test_0108

Conflicts:
recipes/enigma2/enigma2-plugins.bb
recipes/enigma2/enigma2-skins.bb
recipes/enigma2/enigma2.bb
recipes/gstreamer/gst-plugins-bad_0.10.20.bb
recipes/gstreamer/gst-plugins-ugly_0.10.16.bb
recipes/enigma2/enigma2-plugins.bb
recipes/enigma2/enigma2.bb
recipes/gstreamer/gst-plugin-dvbmediasink.bb
recipes/gstreamer/gst-plugins-bad_0.10.20.bb
recipes/gstreamer/gst-plugins-base_0.10.31.bb
recipes/gstreamer/gst-plugins.inc