Merge branch 'org.openembedded.dev' of git://git.openembedded.net/openembedded into...

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

diff --cc conf/checksums.ini
index e07987b,a4f7357..e0d1a45
--- 1/conf/checksums.ini
--- 2/conf/checksums.ini
+++ b/conf/checksums.ini
@@@ -50,10 -50,10 +50,14 @@@ sha256=f09d4ae3365b876da9f40f49178ab724
  md5=333b0e9328194f28af83c26d3717e4ac
  sha256=8930ebfdc8a606d8cb26f073d4700460c3289fb79e943e12948329e17336ca47
  
 +[http://www.ralinktech.com.tw/data/drivers/2008_0506_RT73_Linux_STA_Drv1.1.0.1.tar.bz2]
 +md5=3e08bf734b740e83391fda571c8e9ecd
 +sha256=932b9c127992fd7985e4054d91120164e54f7132fa457b06fdcd30307e5b70f9
 +
+ [http://maxim.org.za/AT91RM9200/2.6/2.6.25-at91.patch.gz]
+ md5=4469d6336f9659f1725fedd4a52261ad
+ sha256=7a960180e7873b1bdb522e76b0423b5c2c1b8efe1d30d7ca80c41eb97d822b2d
+ 
  [http://sense.net/zc/free42/42c_skins.tgz]
  md5=24b0e5bbfe21ea9c5a5c589bcc79c0f2
  sha256=ab877846c6caaff32efbf5be6fc5c63b7dec97a2e78c57c525da7705d2052bfc
@@@ -4134,18 -4134,10 +4170,23 @@@ sha256=a525f321e875a8c16f5b6942bc02ac66
  md5=dad1a4a08c475b31a6b62e7dc92fe9d2
  sha256=5287e943265b9efe5bd59cd1f3145d3fbf9e266df28938ad78e2107fde3c1587
  
 +[http://sources.dreamboxupdate.com/download/opendreambox/dreambox-blindscan-utils-dm8000-1.0.tar.bz2]
 +md5=4e540e321fb76df423fc166ddfd83773
 +sha256=167494f7617d2f8d8c25d9dab7a4ab5ec26b91bbe06413365f31ddedabc3bed6
 +
 +[http://sources.dreamboxupdate.com/snapshots/dreambox-dvb-modules-dm8000-2.6.12-5.1-brcmstb-dm8000-20080920.tar.bz2]
 +md5=a508ee35044989c41e7f49664496cedf
 +sha256=47e7132ed5ec55bbaec2348cd5b61cc610a762a247cb4d3aebc9e47ff19fc9be
 +
 +[http://sources.dreamboxupdate.com/download/opendreambox/dreambox-dvb-tools-v3-1.5.tar.gz]
 +md5=da705f04302e87c7b4e83903ce4b5707
 +sha256=d2005e7b8ea9d8d8b4503117daf18a642bbabd0e013d41302c5f80e3333c67ef
 +
+ [ftp://ftp.debian.org/debian/pool/main/d/dpkg/dpkg_1.14.23.tar.gz]
+ md5=9c1744d32ceed71cbe1db863f64d329d
+ sha256=7d27f2389e05b8727c6a7126c0b65d67749c170ba143e648912a88f2fe707bca
++>>>>>>> e625b67830de99dc50610802c9412bd92baced46:conf/checksums.ini
+ 
  [http://xorg.freedesktop.org/releases/individual/proto/dri2proto-1.1.tar.bz2]
  md5=1d70f0653b0b3a837853262dc5d34da4
  sha256=69def6d1f64b3699ec9c729596d8b096623a62bdda6bbea78ed690421d174c11

diff --cc packages/avahi/avahi.inc
Simple merge

diff --cc packages/busybox/busybox_1.11.3.bb
Simple merge

diff --cc packages/dbus/dbus.inc
Simple merge

diff --cc packages/dsplink/dsplink.inc
index 3bbdab3,3a5c7f6..5ce761f
--- 1/packages/dsplink/dsplink.inc
--- 2/packages/dsplink/dsplink.inc
+++ b/packages/dsplink/dsplink.inc
@@@ -13,30 -11,11 +11,34 @@@ export DSPLINK="${S}
  
  require ti-paths.inc
  
 +DSPLINKPLATFORM ?= "DAVINCI"
 +DSPLINKPLATFORM_omap5912osk = "OMAP"
 +DSPLINKPLATFORM_beagleboard = "OMAP3530"
 +DSPLINKPLATFORM_davinci-sffsdr = "DAVINCI"
 +DSPLINKPLATFORM_davinci-dvevm = "DAVINCI"
 +
 +DSPLINKDSP ?= "C64XX"
 +
 +DSPLINKSOC ?= "DM6446"
 +DSPLINKSOC_beagleboard = "3530"
 +
 +DSPCFG ?= "DM6446GEMSHMEM"
 +DSPCFG_beagleboard ?= "OMAP3530SHMEM"
 +
 +GPPOS ?= "DAVINCILSP"
 +GPPOS_beagleboard = "OMAPLSP"
 +
 +export DSPLINKPLATFORM 
 +export DSPLINKDSP
 +export DSPLINKSOC
 +export DSPCFG
 +export GPPOS
 +
  do_configure () {
+       # Clean up stale binaries
+       find ${S} -name "*.ko" -exec rm {} \; || true
+       find ${S} -name "*.o" -exec rm {} \; || true
+ 
        # Run perl script to create appropriate makefiles (v1.60 and up)
        (
        cd ${DSPLINK}

diff --cc packages/madwifi/madwifi-ng_r.inc
Simple merge

diff --cc packages/samba/samba.inc
Simple merge

diff --cc packages/samba/samba_3.2.5.bb
Simple merge

diff --cc packages/wpa-supplicant/wpa-supplicant_0.5.10.bb
Simple merge