Merge branch 'org.openembedded.dreambox' of git://git.opendreambox.org/git/ghost...
authorFelix Domke <felix.domke@multimedia-labs.de>
Thu, 10 Sep 2009 15:38:20 +0000 (17:38 +0200)
committerFelix Domke <felix.domke@multimedia-labs.de>
Thu, 10 Sep 2009 15:38:20 +0000 (17:38 +0200)
commit965c6de1810a85f7c0fa66aa4edda3e882f85b54
treecf5c6976bac778b3550e88fd78090cce757e55b8
parent9a700489ea486868a268a7844b886ca12d77627b
parent83eb51ead4747e175623ca6d7635f71ec305dab1
Merge branch 'org.openembedded.dreambox' of git://git.opendreambox.org/git/ghost/opendreambox-1.5 into org.openembedded.dreambox

Conflicts:
packages/gstreamer/gst-plugins-bad_0.10.14.bb