Merge branch 'org.openembedded.dev' of git://git.openembedded.net/openembedded into...
authorFelix Domke <tmbinc@elitedvb.net>
Thu, 23 Oct 2008 09:55:28 +0000 (11:55 +0200)
committerFelix Domke <tmbinc@elitedvb.net>
Thu, 23 Oct 2008 09:55:28 +0000 (11:55 +0200)
commit76f3b3574f85724d443abefad232ae12bc3130d4
tree78813b00bde380c2f3a83ab2857595eba656be51
parent704d9e50e746194cb0cabae8198fe8641c077cba
parenta1fe56a1aa249ee94df6d67f58df6c87a1d0b2d9
Merge branch 'org.openembedded.dev' of git://git.openembedded.net/openembedded into opendreambox

Conflicts:

packages/madwifi/madwifi-ng_r3314-20080131.bb
packages/python/python_2.5.2.bb
17 files changed:
classes/package.bbclass
packages/autofs/autofs_4.1.4.bb
packages/base-files/base-files_3.0.14.bb
packages/eglibc/eglibc_svn.bb
packages/gstreamer/gst-plugins-base_0.10.17.bb
packages/gstreamer/gst-plugins-good_0.10.7.bb
packages/gstreamer/gst-plugins-ugly_0.10.7.bb
packages/libsidplay/libsidplay_1.36.59.bb
packages/libungif/libungif_4.1.3.bb
packages/madwifi/madwifi-ng_r.inc
packages/madwifi/madwifi-ng_r3837-20080802.bb
packages/netkit-base/netkit-base_0.17.bb
packages/ppp/ppp_2.4.3.bb
packages/samba/samba-essential_3.0.20.bb
packages/sysvinit/sysvinit_2.86.bb
packages/tasks/task-boot.bb
packages/vsftpd/vsftpd_2.0.5.bb