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

2 files changed, 30 insertions, 6 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index e797fd5c06..bd3f7aebe3 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -11342,6 +11342,10 @@ sha256=12205d01cb99900ed6f936a09ac31b5849f8a7ff3c9a93e5857a76dc3e30788a
 md5=19bc6cc07951b3382d1ac8525b20e83f
 sha256=831f450a0fa18c881b00ec50e8916ed66ca0fecb53cd1939f0abcc02930f9847
 
+[http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.17.tar.bz2]
+md5=833546cd2b8bbf86b8ed083b00897918
+sha256=4f41fbd325270416c9f55d900e470482a7d1e7efbdbb725ed03a085dec307ad6
+
 [http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.2.tar.bz2]
 md5=03d3d0b5f19014fe0065234a3ea65ee6
 sha256=dd92993d08930cca071893b5d3f5cb40a4498f3ddaf12da98c0bbe8c27605e81
@@ -13494,6 +13498,10 @@ sha256=afe5bddd14c06e1e9350742c5569511039ceaf82a2437b89a62c7ae8c82df245
 md5=f2a893efdc2712b70ee8fbb65da2a70e
 sha256=f219303e60f81b3cf6206b6c1851bd42069bd018ed18482ab04dded0b4339f8a
 
+[http://repository.maemo.org/pool/maemo5.0/free/k/kernel/kernel_2.6.28-20094803.3+0m5.diff.gz]
+md5=fdd13af46cbaf8594b9fc3d82070aecc
+sha256=78ab82b0d6647d196fe3f6185a743da4b1846730668b078beb814c717fdd0bb5
+
 [http://www.kerneloops.org/download/kerneloops-0.11.tar.gz]
 md5=a0daa9437f0638912a91afe66f51545b
 sha256=2f23a1a2f1b928b2ad44f13a98c704c3d7abd5e3c7157f6a8915acc74c8dcd71
@@ -17498,10 +17506,6 @@ sha256=877af8ed89e56af004bb0662c1a9cfc785b40c602f71a8bf81521991026cf2f0
 md5=5fc8e9f43fa44ac29ddf9a9980af57d8
 sha256=877af8ed89e56af004bb0662c1a9cfc785b40c602f71a8bf81521991026cf2f0
 
-[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.8.1.tar.bz2]
-md5=f00fd1b5a80f52baf9d1d83acddfa325
-sha256=910f4af05f40ed9a6ab3bc8ccf7ca77365fb7bfe9b5dcfa7ff316e03b354d4ff
-
 [http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.11.tar.bz2]
 md5=f00fd1b5a80f52baf9d1d83acddfa325
 sha256=1fa39c202efe168bfeb0ddd74c8e4814f77da7dc78993e47826bad9173b95808
@@ -17742,6 +17746,10 @@ sha256=0acd83f7b85db7ee18c2b0b7505e1ba6fd722c36f49a8870a831c851660e3512
 md5=260551284ac224c3a43c4adac7df4879
 sha256=5099786d80b8407d98a619df00209c2353517f22d804fdd9533b362adcb4504e
 
+[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.8.1.tar.bz2]
+md5=f00fd1b5a80f52baf9d1d83acddfa325
+sha256=910f4af05f40ed9a6ab3bc8ccf7ca77365fb7bfe9b5dcfa7ff316e03b354d4ff
+
 [http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.9.tar.bz2]
 md5=e921200f074ca97184e150ef5a4af825
 sha256=f5dba6366e87e91234d1b0069cfea655b0a4cb37ea97f899226f16998e6ab9f1
@@ -21634,6 +21642,10 @@ sha256=ed3ec802ccb3585bf0a57724471fa24b98cce5caef8f35d6c26fed7c9213168d
 md5=79782ebd9672c39dd7303d7442756556
 sha256=ad9e0c07e709e9e9a60abe0b15a61482645f3aa64b30fa72c27f1bd13d7aa84d
 
+[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.27.44.bz2]
+md5=da09ddd041a3fb35d236d37ec6de88e9
+sha256=a63144608d5fa72b23151022d9d716e9ebc5b428e6307535481a4f48adb2cfe8
+
 [http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.27.8.bz2]
 md5=ec23e3dce22b23ca681199fe515f10fb
 sha256=31c35db09289c6e0436a258745d7180e0cd8f567949f27b3dab5a57a3664ed2f
@@ -21702,6 +21714,10 @@ sha256=0f32fb48b0c13991bc1a29f378e6435ff3d56408e8952e790ad25597e8870540
 md5=43977a0a264dd7d173b6ef122c62fb20
 sha256=34586de4c7d1517842dfe32a8621f945cd6b8ee55096f8f053a66accd3d17a41
 
+[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.31.12.bz2]
+md5=ce365b2c72ad0855e1746a80b7abdade
+sha256=7dea28a76ca6362ad949ec1bf45fada4a6fc888b40360d90d2f56f01d18f72ae
+
 [http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.31.3.bz2]
 md5=24d60ad6645211e2c08dc1c1c578b249
 sha256=ed167dcbdf52c2563a30e7c81a0f2b3d79eb04acc5728e6d484166a4fe8a39e4
@@ -21734,6 +21750,10 @@ sha256=26f6fad3259ad6d2356cfa04462ace5fd3b5cecec410bbcefe7d5f6dbeb00baa
 md5=924b7aa0fcd6e54c12ecc9b3c3082f59
 sha256=d207f4217c4b3fef9c5a19620b6ca90dbd9b9583ed9c686b5636eec973a7cc60
 
+[http://kernel.org/pub/linux/kernel/v2.6/patch-2.6.32.5.bz2]
+md5=49e6bc73c7a7f690fe7ddf09fe2b5d06
+sha256=b4d0d667db5094fd430ed58955f4f9ed71d278d5ce70e63d287c53f8db028ac3
+
 [http://www.muru.com/linux/omap/patches/patch-2.6.9-omap1.bz2]
 md5=d6249654087f0bcafaa860ac573316a4
 sha256=91806347cb386002a8bfd20ee66e536e4a7dfb01f207dd751341f2971090d9ac
@@ -23702,6 +23722,10 @@ sha256=9cfe0418699e231587182b441c8f6ca68f109059c62bfc8dd9daeafb8277d211
 md5=2a7b5126f2450d8525af355fc4c12ad6
 sha256=55259c813324f6383cbd441aa2f23e01c320b6d63fbe3b5d52a7715055d28589
 
+[ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-4.6.1.tar.gz]
+md5=0542a4be6425451ab5f668c6899cac36
+sha256=4c84b39b8a2546854ce9c0c9f761dd55da76dab2c33eeb876e3d17db1d2ea0c5
+
 [ftp://ftp.trolltech.com/qt/source/qt-x11-free-3.3.5.tar.bz2]
 md5=05d04688c0c0230ed54e89102d689ca4
 sha256=aac89e862c74b2f3ead768e50e9fa7ada1e4225fe9d1d9e05723a3279259eb96
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index d881202b09..960169afbd 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -123,7 +123,7 @@ PREFERRED_VERSION_bvi ?= "1.3.1"
 PREFERRED_VERSION_bwmon ?= "1.3"
 PREFERRED_VERSION_bzflag ?= "1.10.6.20040515"
 PREFERRED_VERSION_bzflag-server ?= "1.10.6.20040515"
-PREFERRED_VERSION_bzip2 ?= "1.0.2"
+PREFERRED_VERSION_bzip2 ?= "1.0.5"
 PREFERRED_VERSION_cacao-cldc ?= "0.98"
 PREFERRED_VERSION_cacaoh-cldc-native ?= "0.98"
 PREFERRED_VERSION_cairo ?= "1.6.4"
@@ -1429,7 +1429,7 @@ PREFERRED_VERSION_phoneserver ?= "1.0"
 PREFERRED_VERSION_php ?= "5.2.0"
 PREFERRED_VERSION_php-native ?= "5.2.0"
 PREFERRED_VERSION_picocom ?= "1.4"
-PREFERRED_VERSION_pidgin ?= "2.5.8"
+PREFERRED_VERSION_pidgin ?= "2.6.5"
 PREFERRED_VERSION_pine ?= "4.64"
 PREFERRED_VERSION_pipeman ?= "1.0.0"
 PREFERRED_VERSION_pipepanic ?= "0.1.1"