Merge branch 'org.openembedded.dev' of git@git.openembedded.net:/openembedded into...
authorFelix Domke <tmbinc@elitedvb.net>
Mon, 10 Nov 2008 01:07:46 +0000 (02:07 +0100)
committerFelix Domke <tmbinc@elitedvb.net>
Mon, 10 Nov 2008 01:07:46 +0000 (02:07 +0100)
commitddd22982df886eee4266c7d17fbafd0263a7f678
tree7267498233bd14b150f13bd70307fb7f8e4107b2
parent5407dc438fe5ca62460ee21624882987f5cedb88
parentf214c817b75a34178104af79623bb7e8fa22210d
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:/openembedded into opendreambox

Conflicts:

packages/gstreamer/gst-plugins-ugly_0.10.7.bb
packages/gstreamer/gst-plugins.inc
classes/package.bbclass
conf/checksums.ini
packages/gstreamer/gst-plugins-ugly_0.10.7.bb
packages/gstreamer/gst-plugins.inc
packages/sysvinit/sysvinit_2.86.bb