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

Conflicts:

	packages/dsplink/dsplink.inc

diff --cc conf/checksums.ini
Simple merge

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

diff --cc packages/python/python-2.5-manifest.inc
Simple merge

diff --cc packages/python/python_2.5.2.bb
index f9e0051,a405c49..c2991d6
--- 1/packages/python/python_2.5.2.bb
--- 2/packages/python/python_2.5.2.bb
+++ b/packages/python/python_2.5.2.bb
@@@ -3,10 -3,10 +3,10 @@@ HOMEPAGE = "http://www.python.org
  LICENSE = "PSF"
  SECTION = "devel/python"
  PRIORITY = "optional"
 -DEPENDS = "python-native db gdbm openssl readline sqlite3 tcl tk zlib"
 +DEPENDS = "python-native db gdbm openssl readline sqlite3 zlib"
  DEPENDS_sharprom = "python-native db readline zlib gdbm openssl"
  # bump this on every change in contrib/python/generate-manifest-2.5.py
- PR = "ml16"
+ PR = "ml18"
  
  PYTHON_MAJMIN = "2.5"