Merge branch 'org.openembedded.dev' of git://git.openembedded.net/openembedded into...
authorFelix Domke <tmbinc@elitedvb.net>
Mon, 8 Jun 2009 10:52:04 +0000 (12:52 +0200)
committerFelix Domke <tmbinc@elitedvb.net>
Mon, 8 Jun 2009 10:52:04 +0000 (12:52 +0200)
commit855b2cfe7139b63941b2508dcbe60530482181b9
treeb95565988f1dbd4e2b72e0aab754d79e022811e2
parentd93ab8cf1574c21e952b2c4195b2364c1656d177
parent654cb590ae11f3ada8ed877a6f81f14cabe7b506
Merge branch 'org.openembedded.dev' of git://git.openembedded.net/openembedded into opendreambox

Conflicts:

conf/checksums.ini
conf/checksums.ini
recipes/base-files/base-files_3.0.14.bb
recipes/busybox/busybox_1.11.3.bb
recipes/busybox/busybox_1.13.2.bb
recipes/sysvinit/sysvinit_2.86.bb