Merge remote-tracking branch 'dm/opendreambox-1.6' into test_0921
authorschon <schon@dev03-server>
Thu, 22 Sep 2011 01:08:49 +0000 (10:08 +0900)
committerschon <schon@dev03-server>
Thu, 22 Sep 2011 01:08:49 +0000 (10:08 +0900)
commit53516cb407412ea03e422cddb71a60e07dcab4c7
tree2c952b87f19f7d47fe938b33d8c7726cf9a2eecb
parent64e7fa682b6c263d32f76ab505411f98bbfd76d2
parentcf2694fcfe20d602f373989016cd82c9f085dc78
Merge remote-tracking branch 'dm/opendreambox-1.6' into test_0921

Conflicts:
recipes/qt4/qt-4.7.4.inc
recipes/qt4/qt4-native_4.7.4.bb
recipes/enigma2/enigma2.bb
recipes/gstreamer/gst-plugin-dvbmediasink.bb
recipes/gstreamer/gst-plugins-bad_0.10.21.bb
recipes/gstreamer/gst-plugins-bad_0.10.22.bb
recipes/gstreamer/gst-plugins-base_0.10.35.bb
recipes/gstreamer/gst-plugins-ugly_0.10.18.bb
recipes/python/python_2.6.4.bb
recipes/python/python_2.6.7.bb