Merge branch 'org.openembedded.dev' of git@git.openembedded.net:/openembedded into...
authorFelix Domke <tmbinc@elitedvb.net>
Sun, 16 Nov 2008 22:41:31 +0000 (23:41 +0100)
committerFelix Domke <tmbinc@elitedvb.net>
Sun, 16 Nov 2008 22:41:31 +0000 (23:41 +0100)
commit55165587da121c0a532d394d044e42409bb55ddb
tree38b232df4c625da18e19736422cc72122da0ce0c
parentffca5275a728f77924a75ea72b5f5b751c6c092e
parent6dc5a3e12765cff8045ee8f52849b9dd0d33c720
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:/openembedded into opendreambox

Conflicts:

conf/checksums.ini
conf/checksums.ini
packages/dsplink/dsplink.inc
packages/sysvinit/sysvinit_2.86.bb