Merge branch 'org.openembedded.dev' of git://git.openembedded.net/openembedded into...
authorFelix Domke <tmbinc@elitedvb.net>
Tue, 6 Jan 2009 15:21:37 +0000 (16:21 +0100)
committerFelix Domke <tmbinc@elitedvb.net>
Tue, 6 Jan 2009 15:21:37 +0000 (16:21 +0100)
commitb7e1ce9ead6310238d0c0164c41bd0ff78f6e0ef
treed4408caaefa2a49cba0dfb9b24c6bf6a3d758802
parent9035d831eb9b9c8b7398923d4716959742c34875
parente625b67830de99dc50610802c9412bd92baced46
Merge branch 'org.openembedded.dev' of git://git.openembedded.net/openembedded into opendreambox

Conflicts:

conf/checksums.ini
packages/base-files/base-files_3.0.14.bb
packages/eglibc/eglibc_svn.bb
packages/gstreamer/gstreamer_0.10.21.bb
packages/vsftpd/vsftpd_2.0.5.bb
conf/checksums.ini
packages/avahi/avahi.inc
packages/busybox/busybox_1.11.3.bb
packages/dbus/dbus.inc
packages/dsplink/dsplink.inc
packages/madwifi/madwifi-ng_r.inc
packages/samba/samba.inc
packages/samba/samba_3.2.5.bb
packages/wpa-supplicant/wpa-supplicant_0.5.10.bb