Merge commit 'dm/opendreambox-1.6' into test
authorschon <schon@dev03-server>
Tue, 12 Oct 2010 06:52:01 +0000 (15:52 +0900)
committerschon <schon@dev03-server>
Tue, 12 Oct 2010 06:52:01 +0000 (15:52 +0900)
commit823e783a17cfb7d1fffc202d15dfc34f83cf324c
tree5fe07ec42660d67c75b968b981aacb717d075cec
parent922731e80f0d3294edeea2addffabb6f19bd0550
parent576a5b85f00e5c894c93621729ba072cda3460f8
Merge commit 'dm/opendreambox-1.6' into test

Conflicts:
recipes/enigma2/enigma2-defaultservices.bb
recipes/gstreamer/gst-plugin-dvbmediasink.bb