Merge commit 'oe/org.openembedded.dev' into opendreambox
authorFelix Domke <tmbinc@elitedvb.net>
Fri, 24 Apr 2009 14:20:57 +0000 (16:20 +0200)
committerFelix Domke <tmbinc@elitedvb.net>
Fri, 24 Apr 2009 14:20:57 +0000 (16:20 +0200)
commitddf0663420b9f93cfdf7fd0374be1bf610c4b1af
treeca006095b0c4aa82439bc9fd7e66e070cd0ed197
parent62c787727ff688e58321ed886ca7000c3cc7a224
parentd03984dc6ef1414c1983361229434b97606ff42d
Merge commit 'oe/org.openembedded.dev' into opendreambox

Conflicts:

conf/checksums.ini
recipes/dbus/dbus.inc
classes/package.bbclass
conf/checksums.ini
recipes/dbus/dbus.inc
recipes/mc/mc.inc
recipes/opkg/opkg.inc
recipes/ppp/ppp_2.4.3.bb
recipes/python/python_2.6.1.bb
recipes/sysvinit/sysvinit_2.86.bb
site/powerpc-common