Merge branch 'opendreambox' of git://git.opendreambox.org/git/openembedded into opend...
authorMoritz Venn <moritz.venn@freaque.net>
Fri, 29 May 2009 18:09:50 +0000 (20:09 +0200)
committerMoritz Venn <moritz.venn@freaque.net>
Fri, 29 May 2009 18:09:50 +0000 (20:09 +0200)
commit12d46a7621553783616596c2b42f30892982a070
tree715ced0be5b18b52f75fe230b9e8d3443054cb96
parent92dafa15a39ffa498a94afc11872cd8a9f9a1c33
parent6ee80845bca8dedd335c8c4a1a2c09871e0307e2
Merge branch 'opendreambox' of git://git.opendreambox.org/git/openembedded into opendreambox

Conflicts:
recipes/gstreamer/gst-plugins-base/samihack.patch
recipes/gstreamer/gst-plugins-base_0.10.22.bb
conf/distro/opendreambox.conf
recipes/gstreamer/gst-plugins-base_0.10.22.bb