Merge branch 'org.openembedded.dev' of git@git.openembedded.net:/openembedded into...
authorFelix Domke <tmbinc@elitedvb.net>
Fri, 12 Dec 2008 12:26:22 +0000 (13:26 +0100)
committerFelix Domke <tmbinc@elitedvb.net>
Fri, 12 Dec 2008 12:26:22 +0000 (13:26 +0100)
commit0ba06add34b6558fe39c91a615d19e39546b8921
treeded3069c1913621d57d31b510a8eb7a4a84be442
parent4fb763298a2e2a534598421136ae3a741feeb73d
parent2f0fcff486dba9daa7b35cc96a3dce86f16ae30d
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:/openembedded into opendreambox

Conflicts:

packages/dsplink/dsplink.inc
conf/checksums.ini
packages/dsplink/dsplink.inc
packages/python/python-2.5-manifest.inc
packages/python/python_2.5.2.bb