[oe-commits] Felix Domke : Merge branch 'org.openembedded.dreambox' of git://git. opendreambox.org/git/ghost/opendreambox-1.5 into org.openembedded.dreambox

[git version control]

Module: openembedded.git
Branch: org.openembedded.dreambox
Commit: 965c6de1810a85f7c0fa66aa4edda3e882f85b54
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=965c6de1810a85f7c0fa66aa4edda3e882f85b54

Author: Felix Domke <felix.domke at multimedia-labs.de>
Date:   Thu Sep 10 17:38:20 2009 +0200

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

---