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

Conflicts:
	recipes/linux/linux-kirkwood_2.6.33-rc1.bb

17 files changed, 182 insertions, 126 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 1cc08703e6..3985d1ffd9 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -3974,6 +3974,10 @@ sha256=9c86a5668a2834f02ec44967737d6341c575e2a1deec76944f47be0292a3cfd7
 md5=0ce88fc52025b44812d090d10244b2a4
 sha256=9c86a5668a2834f02ec44967737d6341c575e2a1deec76944f47be0292a3cfd7
 
+[http://downloads.sourceforge.net/cbrpager/cbrpager-0.9.20.tar.gz]
+md5=e1aee9221ec69ca8cc3a55093095ecf3
+sha256=8838c53c49d2982c4d716ff5f241cf7168d5c4c5888cd73db21e73402dd5db39
+
 [http://samba.org/ftp/ccache/ccache-2.4.tar.gz]
 md5=73c1ed1e767c1752dd0f548ec1e66ce7
 sha256=435f862ca5168c346f5aa9e242174bbf19a5abcaeecfceeac2f194558827aaa0
@@ -4778,6 +4782,10 @@ sha256=c64eb1923366934357c917ff9a94237a8157de24a1fd96e0f91c4d5dfad83026
 md5=d06dcf3e3b2f8eb25216431ec055aa4b
 sha256=c64eb1923366934357c917ff9a94237a8157de24a1fd96e0f91c4d5dfad83026
 
+[http://www.kernel.org/pub/linux/utils/kernel/cpufreq/cpufrequtils-006.tar.bz2]
+md5=124b0de8f3a4d672539a85ce13eed869
+sha256=b8e77854a1400b0cc73295f3ee5d0a0c3650438e677526a199e08f6680c15aa1
+
 [http://www8.in.tum.de/~schneifa/group/sources/cpusage-0.1.tar.gz]
 md5=f779140995280de32817ec4a133f4d60
 sha256=feb0b8c73c771390a8771fc3a4ed01104c008bcd278a267eb00263794956778c
@@ -5934,6 +5942,10 @@ sha256=2cc10fee2b29add737e454eb634513135b34a638f7ca2b18364864fe089020dc
 md5=e218df6c84fc17c1126d31de9472a76c
 sha256=b3d7d0e1058a3740ddae83d47285bd9dce161eec9e299dde7996ed721da32198
 
+[http://downloads.sourceforge.net/e2fsprogs/e2fsprogs-1.41.9.tar.gz]
+md5=52f60a9e19a02f142f5546f1b5681927
+sha256=cbf1e34261a16b3d7911b60b91290b19f2010036d6ba628d45b5f0b2af2b66e8
+
 [http://downloads.sourceforge.net/e2fsprogs/e2fsprogs-libs-1.33.tar.gz]
 md5=c7545bb05e0c2fc59174f0dc455c6519
 sha256=a65d064bee3e97c164d07a490692db0e73da8da10019ad9a89866706c93ae703
@@ -8554,6 +8566,10 @@ sha256=b83db2613192df8a8865ca59877de5181df6247cd17be42418cc5a39d314d5a4
 md5=917dc80f5ef6adcdc15193de238476db
 sha256=da77a6fd9d4cc76b68dd4354839f953f8df5fb7921c7777b80256916533a3e7a
 
+[http://ftp.gnome.org/pub/GNOME/sources/gdm/2.28/gdm-2.28.2.tar.bz2]
+md5=9607c6bac31c9d8bd3446e66a4576c2e
+sha256=0165b4bf70e4a6d41d9e42877840805890c438bd655805b961e51adccbd9602a
+
 [http://downloads.sourceforge.net/geany/geany-0.14.tar.bz2]
 md5=c6c22c7f9feff81a15f5c8ece03b87c1
 sha256=619d59b339e1be7687058460c105b8f2d4f00e6409e4450dee385e3086fdf6d7
@@ -8750,6 +8766,10 @@ sha256=71e285da2f8f03dd0c6f6a969d1f541ab2a2f1a9d91e26f6f60779897d68824e
 md5=9a34b924ea10ce0a1d62441ee2bacfff
 sha256=80db72ac16463ce084e76dc9aaae5b54ce8db085610c98fe2975c5b8f51a598d
 
+[ftp://ftp-fourier.ujf-grenoble.fr/xcas/giac-0.8.4.tar.gz]
+md5=c0bdb493cfef3dd058cc3750101a4f47
+sha256=354923541221670d48ea2d713abd3fcad94e7f0d220ac9d53e9bcee0eda6ed4a
+
 [http://linuxbrit.co.uk/downloads/giblib-1.2.3.tar.gz]
 md5=06ae3113fdfe9f05a642bd844cc85eab
 sha256=42eb6bff68e88ef12a7ac2aa69848aeb29a8b69176b3bd3d9d67cf9a1233fe85
@@ -9262,6 +9282,10 @@ sha256=7ff592b6687caefa367b33d8cb8f66f3c0273fa86d4b688c0758d0d9fee7a2cb
 md5=78fe56143bab9a7df232fa15e35a54a6
 sha256=972da0f1c35df459b99b24f5bbed5ddec150b714540e2254b6b37035117167ed
 
+[http://glista.googlecode.com/files/glista-0.4.tar.gz]
+md5=db4afe3ba157232a6debe58885c693e6
+sha256=39289c0fc3efd3b003730212201ce7d8a56b06fcf080188ecc76d4ad9375c807
+
 [http://camaya.net/download/gloox-0.8.1.tar.bz2]
 md5=9054d072f5972d5e567c428531734ad5
 sha256=7f836c8189b55ef4ec8f3387673687d0a5c1a713abc9617144638b28e6857bd2
@@ -10034,6 +10058,10 @@ sha256=a252aff88d801175b27fd7c20e00b0b5f674a5a70e64cd95091abdcab87db35c
 md5=c48a89bfceeb604f163aa55540088021
 sha256=0fe2f4d7c39e85b5b577c6fa7a88c9a135ae5819cc521083af888e4c23deaacd
 
+[http://downloads.sourceforge.net/grecipe-manager/gourmet-0.15.2.tar.gz]
+md5=d18be0dd5faf7249f657c4cc87105c31
+sha256=d1130c71a876f333707aa8dd8b9689a0aaf115e782ec4a033359eb2995942848
+
 [http://downloads.sourceforge.net/gparted/gparted-0.3.3.tar.bz2]
 md5=f3d16ccfda72fa1dac9fa1ff9ded2c42
 sha256=c7c86abd344055bdf1f840a037d04064759f52039cb075260b60369b721f245c
@@ -11138,6 +11166,10 @@ sha256=d9e056793d05bf0b6f4989b27d3107c2f223a14205ee54be403bbe52945c8853
 md5=f3c32e0bc3ec1be461ce43e407a6a67f
 sha256=cba1eac94de8de8c181c6c60dfc59f8069d388761aba71bcd8c48b8ba9b2edf5
 
+[http://core.fluendo.com/gstreamer/src/gst-fluendo-mpegdemux/gst-fluendo-mpegdemux-0.10.23.tar.bz2]
+md5=dd1923a4b3c397b16286bc7a903f5e75
+sha256=e8da54a2cc35e6cc4876cb64b00b20e9b7058806ff1ff7f4da002b14f4652b4f
+
 [http://core.fluendo.com/gstreamer/src/gst-fluendo-mpegdemux/gst-fluendo-mpegdemux-0.10.7.tar.bz2]
 md5=ee93b63fb9a7a3081c3d68fdd83949be
 sha256=8e6e078161d9cc020ac9a403c3e7c0f124684c994d66b01895b147bf618bdc13
@@ -11890,6 +11922,10 @@ sha256=80655b3531ea56a5d64085e572dfb8d3ecabffd28af482cd130f72dfdd6254b0
 md5=ae7177ab8f0163d3ef2df71f0de2b357
 sha256=33dd87dc9452227375b8b9cdad940581714a55d55ff18ae2990905ac2f81fa0f
 
+[http://downloads.sourceforge.net/hamlib/hamlib-1.2.10.tar.gz]
+md5=29f0d30779a8ffe0444eb523a6ad8344
+sha256=9b50825666519b0b86469f1988a0de09ce2ffc08fa221f9aa40d18c7b7f6c651
+
 [http://downloads.sourceforge.net/hamlib/hamlib-1.2.8.tar.gz]
 md5=74eaf1be4cf1cbdecee54808c6930788
 sha256=be81153a6e2830234d62818c8aa5658b1410b538a3676686a3f1373f03036b81
@@ -17450,6 +17486,10 @@ sha256=c95280ff6c5d2a17788f7cc582d23ae8a9a7ba3f202ec6e4238eaadfce7c163d
 md5=296a6d150d260144639c3664d127d174
 sha256=c95280ff6c5d2a17788f7cc582d23ae8a9a7ba3f202ec6e4238eaadfce7c163d
 
+[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.18.tar.gz]
+md5=bc483723670bda09198d72293e712d42
+sha256=eae56a8a9c788518e88604fff343ce6139cecbc7e44356bf1ff4dc7aaf4e9b33
+
 [http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.19.2.tar.bz2]
 md5=ca0ce8f288e8ae93ac243b568f906bf8
 sha256=c55c52caa613d1f25718b35811e4614d9712b9e1de56a91aa73c867f351a540b
@@ -19898,6 +19938,10 @@ sha256=16dd81625ebfc8f5dcb0dfd2e6bac223aad325a9405d66a556fe349446b3c332
 md5=94441610c9b86ef45c4c6ec609444060
 sha256=61c913299b81a4671ff089aac821329f7db9bc111aa812993dd585798b700349
 
+[http://ftp.de.debian.org/debian/pool/main/n/netkit-ftp/netkit-ftp_0.17-19.diff.gz]
+md5=f7c82f2f78f26dcb869eca2ed633c464
+sha256=2168b592ce254ab6f6daf04b4eafb5607b664c48d85f74698a9376e2cc4503aa
+
 [ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/netkit-rpc-0.17.tar.gz]
 md5=67212720482ea1aea9182a98653a9642
 sha256=421d63b414162237a72867061f1bd3e3752a0d962cd5d30b5e933ddad8a14d3b
@@ -20262,6 +20306,10 @@ sha256=6dbabd9345967120ad21cc25489a6d244aed7975cee9297cc5716af4debc7228
 md5=2f03b81411a1f7c359ada35459d946a5
 sha256=37fb4cffad7e361daffa9915ee6a37e615d0bf4d1f24760e585d5ac922515ca8
 
+[http://www.kernel.org/pub/linux/bluetooth/obexd-0.21.tar.gz]
+md5=3f2a7ae4ddca69001a23c034f8b28db6
+sha256=d29e9694e09fc2a504b84e6929768a90ac76ced5492e755d50c55c350df5bf31
+
 [http://downloads.sourceforge.net/openobex/obexftp-0.20.tar.gz]
 md5=085b9edc0504c0d79e7479a54e2018c5
 sha256=7246fc75257afcd30ff16dc70185057157bcefc12fa9fba111b3b201577cc40e
@@ -21294,6 +21342,10 @@ sha256=b7cba2e38e81abb4d1d33c3f7f7c028310b392d5ee1ed5e3b2137e024598d903
 md5=e786ab1f9c8ee97f054462811a89aaba
 sha256=58007ec7430c5d954d2eccd64879797dfbcce68561c9de232cb59aca4fd2c1f4
 
+[http://kernel.org/pub/linux/kernel/v2.6/testing/v2.6.19/patch-2.6.19-rc6.bz2]
+md5=e786ab1f9c8ee97f054462811a89aaba
+sha256=58007ec7430c5d954d2eccd64879797dfbcce68561c9de232cb59aca4fd2c1f4
+
 [http://www.muru.com/linux/omap/patches/patch-2.6.20-omap1.bz2]
 md5=b220d8b8489003f3df03d897fbefa432
 sha256=f85096df0acc179f676497e75b9ba8d9b8685b92b0b2b8b1d6871619ed879fbd
@@ -23110,6 +23162,10 @@ sha256=cb5a5855c68743622b1902c7c106b30316c623c265906f2acb2fa2c9d97b3f37
 md5=d6d2a16ccd1562b2ae63314f30a4ebf9
 sha256=45b73399b8affd1a81ecd370d37e066c046c49e1777b43d0affe6b520082a604
 
+[http://pypi.python.org/packages/source/p/pyrtm/pyrtm-0.2.tar.gz]
+md5=34423f39caf7df8a9db8e243be9cf1a0
+sha256=d9d46d096a38cb692b55f4ee9f364d54348298e9497b11c1ef057539b5de1567
+
 [http://www.vanille.de/mirror/pyserial-2.0.tar.bz2]
 md5=a8db6163466c21845faa6ef57af992da
 sha256=df76084516b34b5e04dd84e54ef38613d87c56bc04de3d0a711f72fb6707ab0b
@@ -23394,23 +23450,23 @@ sha256=12b7f014e9ac0b650836ee9e54f58bd728c66591b7de94a9a8bd600bfb217622
 md5=6e913e436a7b0f7572ec1ac77db41fde
 sha256=ded3abdab8333aaf7f451963f32465ca1451a38afb173ef64e0f898d907a6e02
 
-[http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/qpf-freemono-1.0.tar.bz2]
+[http://www.openzaurus.org/download/3.5.4/sources/qpf-freemono-1.0.tar.bz2]
 md5=28688d47cd80d3a6bb833adb22292e15
 sha256=5ac0513efe6270d45a2ada5dc653c434677da4282e026d8c1a9c156cd99e11c8
 
-[http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/qpf-freeserif-1.0.tar.bz2]
+[http://www.openzaurus.org/download/3.5.4/sources/qpf-freeserif-1.0.tar.bz2]
 md5=a7fa0210e02f42d5b14245e260bc72c3
 sha256=c8ee6e5e62b0a182dbee85865e56b1572e6875769b8256b39c75b2334a283e45
 
-[http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/qpf-helvetica.tar.bz2]
+[http://www.openzaurus.org/download/3.5.4/sources/qpf-helvetica.tar.bz2]
 md5=20c040a004f4949b6849658148a78388
 sha256=4b6a122b4f95cf90f9639ca423947e70bba4e567099f9baeada419a51b11924b
 
-[http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/qpf-hunkysans-0.3.0-r4.tar.bz2]
+[http://www.openzaurus.org/download/3.5.4/sources/qpf-hunkysans-0.3.0-r4.tar.bz2]
 md5=917d7f8f3ad3c5b94c747b37d0a5e74a
 sha256=c3cdd8f234cbc1694af777dc1739ca4439cd472567d85f333dc11264d6bda7c8
 
-[http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/qpf-hunkyserif-0.3.0-r4.tar.bz2]
+[http://www.openzaurus.org/download/3.5.4/sources/qpf-hunkyserif-0.3.0-r4.tar.bz2]
 md5=02b38aeaf30c17e15b714b9594ca504d
 sha256=3c5890d6b0aee2d4c1e0c6b8101b6b5381985e86bc50dffc338b8601f4aa7ae8
 
@@ -23418,7 +23474,7 @@ sha256=3c5890d6b0aee2d4c1e0c6b8101b6b5381985e86bc50dffc338b8601f4aa7ae8
 md5=92f6df1c5edb26351332df4f576dbb10
 sha256=c1c5b5ab3431896502c9275daeb47610fb2a840faa6d580e140909a3f4ef7391
 
-[http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/qpf-utopia.tar.bz2]
+[http://www.openzaurus.org/download/3.5.4/sources/qpf-utopia.tar.bz2]
 md5=fa2563f3c2332c5bcb05add075908f1e
 sha256=599eed45edc9942f4b37858507c2223cb8decb13fea180cf33c6961ad48a33d1
 
@@ -23446,7 +23502,7 @@ sha256=99e73cec97c62fecaccc4a7f354392ea9964d8c20b0a4a330890c32dbac87732
 md5=1f7ad30113afc500cab7f5b2f4dec0d7
 sha256=883363eb0c94de3d1e36f3ab9e09a8f127418d497213cc1a0ed1a1588ecd66b8
 
-[http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/qt-embedded-2.3.10-snapshot-20060120.tar.gz]
+[http://www.openzaurus.org/download/3.5.4/sources/qt-embedded-2.3.10-snapshot-20060120.tar.gz]
 md5=fec42313fd5508d840240b5dd2fe27eb
 sha256=0a706cf4c2a70dfeff2e886f225007844a4675f5c6387fb46c4b7f7ef327b68e
 
@@ -25838,6 +25894,10 @@ sha256=26c05ef7666881eb1d60291a4293e67d75dbf048ca8a30f6b9eb3dc86ad1b6b0
 md5=d7b8f27b83ff080ff824177d65a7dae0
 sha256=0a63da1c99b6a9b6a93b6fd0a9391c7d8216f658d2bea0ba81999e261c6b6649
 
+[http://pagesperso-orange.fr/sebastien.godard/sysstat-9.0.6.tar.gz]
+md5=c05ca01878a4069199d9af93cbe39c8e
+sha256=464a4e23ab3b7d6886a5b8aa108e05b1a7f42654e1c398a040c88c81f30168c9
+
 [http://cyberelk.net/tim/data/system-config-printer/1.1/system-config-printer-1.1.7.tar.bz2]
 md5=a77bde5adc5ee8822b0764ff786ccc09
 sha256=fdd50cb114151c66b8180c0ce90ba0e99f77a69770ac21598a87be935eec2224
@@ -26258,7 +26318,7 @@ sha256=da26d02c1b98b95343f19ea273b3536beddd94feb2a773a6cb66efebfdff35c0
 md5=5a085296b1147fe970a256a9b2d0f91f
 sha256=f3b5722c145ebeee3523b4941afdaf75d03a56f1922a9d3662dc1715aa24ca34
 
-[http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/tickypip-levels_1.1.tar.bz2]
+[http://www.openzaurus.org/download/3.5.4/sources/tickypip-levels_1.1.tar.bz2]
 md5=cfdaae67b3d33351e37021cb0394153c
 sha256=881109774a77e34c61fbf41a839fe02a95cb3e67a0218fe4aebc5e6999cbaa57
 
@@ -26454,6 +26514,10 @@ sha256=776ddf74b657da5709d8f3d1c800b8203aa82a5f06f1c6d2d0f23a0a5f6685f7
 md5=42f071fcf8ffc471beb3e1689297d647
 sha256=18121f17c37faaa9cc245d46293a24f58f2bba9dc9b84af5e1ffe0ac6e697b04
 
+[http://ftp.gnome.org/pub/GNOME/sources/totem/2.28/totem-2.28.5.tar.bz2]
+md5=03b43f3c3a93b6dbcf1d1b370cc9297f
+sha256=c788bb314addbeeb2b27a2af0f7448752db22dcfaf8b0a4e704463ba9a9dc063
+
 [http://ftp.gnome.org/pub/GNOME/sources/totem-pl-parser/2.23/totem-pl-parser-2.23.3.tar.bz2]
 md5=c163dfd840c6a522e6cd852b379e89cd
 sha256=5730611c42f8a8540343faa9512d9161073d2f882668c80dd0cf6a34c72daa75
@@ -26522,6 +26586,10 @@ sha256=b221d6ecec0c5ca9908f17ae7d56ce139d317faaa0c106e99fb321130280f151
 md5=0b9cf68b68ce04d2e91723e3190c0568
 sha256=6ffff2365e0508fd0e190054f2d57893b8755be8ce4a34e7ef89861c06033eb9
 
+[http://mirrors.m0k.org/transmission/files/transmission-1.80b4.tar.bz2]
+md5=8a257189b51bd3608a8478680230e716
+sha256=c7dc1627e21a5f1625ce4958e247a44fb8b13ce8733085c1d64707bd93ed9178
+
 [http://xorg.freedesktop.org/releases/individual/proto/trapproto-3.4.3.tar.bz2]
 md5=3b713239e5e6b269b31cb665563358df
 sha256=ff32a0d3bc696cadc3457be9c85e9818af2b6daa2f159188bb01aad7e932a0e1
@@ -26730,6 +26798,10 @@ sha256=ee9000a0276675ed697f8d404edf80104fd338c3fb979907e4ee63ca83d65e5e
 md5=3cd8038d7bbfb3a4ac544aceef724853
 sha256=ee9000a0276675ed697f8d404edf80104fd338c3fb979907e4ee63ca83d65e5e
 
+[http://gentoo.prz.rzeszow.pl/distfiles/tzdata2009s.tar.gz]
+md5=3cd8038d7bbfb3a4ac544aceef724853
+sha256=ee9000a0276675ed697f8d404edf80104fd338c3fb979907e4ee63ca83d65e5e
+
 [ftp://ftp.pl.debian.org/pub/debian/pool/main/t/tzdata/tzdata_2007h.orig.tar.gz]
 md5=8b766bb807c1f7c0c02ff798ea5db80e
 sha256=b4c6367ab85de8f148c903bb25dc69de7a7d7d05f204f58880a16a8b81bf93de
@@ -27410,6 +27482,10 @@ sha256=e1d6e89eb8689fb3422502a9020a39fff0a5e6ddb3eb47eed9ac9a00636e06b0
 md5=d13ead3d2926b9e7abd7fe61c3a48181
 sha256=48332dd1a31ac8cf29536111730d6710f79c5e825ca3acd8927e662fb0f25f48
 
+[http://www.freesmartphone.org/sources/vala-0.7.9.7.tar.bz2]
+md5=b05fd8f4420152ca0080a99750863f3f
+sha256=46805e1c19707de043820a1474a8b3775ea3b698a0b539eabd7b86f0f3ad888a
+
 [http://www.freesmartphone.org/sources/vala-0.7.9.tar.bz2]
 md5=f2f8b2914361db599fd6392ec27f7042
 sha256=a71d59cfed750ff402fece5e7d4b656caf3377d5a6bfe5339894f1b13769d58d
diff --git a/conf/distro/include/fso-autorev.inc b/conf/distro/include/fso-autorev.inc
index d719453da8..f5c7974d5b 100644
--- a/conf/distro/include/fso-autorev.inc
+++ b/conf/distro/include/fso-autorev.inc
@@ -37,6 +37,7 @@ SRCREV_pn-libpersistence = "${AUTOREV}"
 SRCREV_pn-mickeydbus = "${AUTOREV}"
 SRCREV_pn-mickeyterm = "${AUTOREV}"
 SRCREV_pn-misc-vapi = "${AUTOREV}"
+SRCREV_pn-msmcommd = "${AUTOREV}"
 SRCREV_pn-python-pytrc = "${AUTOREV}"
 SRCREV_pn-vala-dbus-binding-tool-native = "${AUTOREV}"
 SRCREV_pn-vala-native = "${AUTOREV}"
diff --git a/conf/distro/include/kaeilos-2009-preferred-versions.inc b/conf/distro/include/kaeilos-2009-preferred-versions.inc
index 34f0386772..8b120f2eb2 100644
--- a/conf/distro/include/kaeilos-2009-preferred-versions.inc
+++ b/conf/distro/include/kaeilos-2009-preferred-versions.inc
@@ -4,7 +4,7 @@
 #@NAME: KaeilOS(R) - http://www.kaeilos.com
 #@DESCRIPTION: KaeilOS Linux Distribution preferred version
 #@MAINTAINER: Marco Cavallini <m.cavallini@koansoftware.com>
-#@VERSION: 21-10-2009
+#@VERSION: 11-01-2010
 #
 # KaeilOS is a registered trade mark of KOAN - Bergamo - Italia
 # Product website : http://www.KaeilOS.com 
@@ -14,7 +14,7 @@ PREFERRED_VERSION_autoconf = "2.63"
 PREFERRED_VERSION_autoconf-native = "2.63"
 PREFERRED_VERSION_automake-native = "1.10.2"
 PREFERRED_VERSION_busybox 	= "1.13.2"
-PREFERRED_VERSION_cairo		= "1.8.0"
+PREFERRED_VERSION_cairo		= "1.8.8"
 PREFERRED_VERSION_dbus 		= "1.2.3"
 PREFERRED_VERSION_dropbear      = "0.51"
 PREFERRED_VERSION_fontconfig	= "2.6.0"
@@ -23,36 +23,49 @@ PREFERRED_VERSION_glib-2.0-native = "2.22.1"
 PREFERRED_VERSION_glibmm = "2.22.1"
 PREFERRED_VERSION_glproto	= "1.4.9"
 PREFERRED_VERSION_gst-pulse 	= "0.9.7"
-PREFERRED_VERSION_gtk+		= "2.18.0"
+PREFERRED_VERSION_gtk+		= "2.18.3"
 PREFERRED_VERSION_gtkmm		= "2.18.1"
 PREFERRED_VERSION_hal		= "0.5.13"
 PREFERRED_VERSION_libgemwidget	= "1.0"
 PREFERRED_VERSION_libgpephone	= "0.4"
-PREFERRED_VERSION_libsdl-x11	= "1.2.11"
+PREFERRED_VERSION_libsdl-x11	= "1.2.14"
 PREFERRED_VERSION_libtool 	= "2.2.6a"
 PREFERRED_VERSION_libtool-native = "2.2.6a"
 PREFERRED_VERSION_libtool-cross	= "2.2.6a"
 PREFERRED_VERSION_libtool-sdk	= "2.2.6a"
-PREFERRED_VERSION_libx11 = "1.2"
-PREFERRED_VERSION_mesa = "7.4"
+PREFERRED_VERSION_mesa          = "7.6"
+PREFERRED_VERSION_mesa-dri      = "7.6"
+PREFERRED_VERSION_mesa-xlib     = "7.6"
+PREFERRED_VERSION_mplayer       = "0.0+1.0rc2+svnr30165"
 PREFERRED_VERSION_pango 	= "1.24.4"
-PREFERRED_VERSION_pixman	= "0.13.2"
+PREFERRED_VERSION_pixman	= "0.16.2"
 PREFERRED_VERSION_pkgconfig	= "0.23"
 PREFERRED_VERSION_pkgconfig-native = "0.23"
 PREFERRED_VERSION_pulseaudio 	= "0.9.15"
-PREFERRED_VERSION_python = "2.6.1"
-PREFERRED_VERSION_samba		= "3.3.0"
+PREFERRED_VERSION_python = "2.6.2"
+PREFERRED_VERSION_samba		= "3.3.9"
 PREFERRED_VERSION_tiff 		= "3.8.2+4.0.0beta2"
 
+KAEILOS_QT_VERSION ?= "4.6.0"
+PREFERRED_VERSION_qt4-tools-native = "${KAEILOS_QT_VERSION}"
+PREFERRED_VERSION_qt4-tools-sdk = "${KAEILOS_QT_VERSION}"
+PREFERRED_VERSION_qt4-embedded = "${KAEILOS_QT_VERSION}"
+PREFERRED_VERSION_qt4-embedded-gles = "${KAEILOS_QT_VERSION}"
+PREFERRED_VERSION_qt4-x11-free = "${KAEILOS_QT_VERSION}"
+PREFERRED_VERSION_qt4-x11-free-gles = "${KAEILOS_QT_VERSION}"
+
 PREFERRED_VERSION_udev 		= "141"
 UDEV_GE_141 = "1"
 
 PREFERRED_VERSION_usbutils = "0.82"
-PREFERRED_VERSION_util-macros-native = "1.2.1"
-PREFERRED_VERSION_util-macros = "1.2.1"
 PREFERRED_VERSION_wpa-supplicant = "0.6.9"
 PREFERRED_VERSION_xserver-kdrive = "1.4.0.90"
-PREFERRED_VERSION_xserver-xorg = "1.6.1"
+
+# Use latest version available
+#PREFERRED_VERSION_util-macros-native = "1.4.1"
+#PREFERRED_VERSION_util-macros = "1.4.1"
+#PREFERRED_VERSION_xserver-xorg = "1.7.3"
+#PREFERRED_VERSION_xf86-video-xgi = "1.5.1"
 
 #
 # meta-moblin package SRCREVs
diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc
index c826a79131..c726e5fdf9 100644
--- a/conf/distro/include/preferred-shr-versions.inc
+++ b/conf/distro/include/preferred-shr-versions.inc
@@ -39,6 +39,3 @@ UDEV_GE_141 = "1"
 # Downgraded
 # python-pygtk_2.16.0 is accessing non-existent /usr/share/pygobject/2.0/codegen/codegen.py
 PREFERRED_VERSION_python-pygtk = "2.10.4"
-
-# 2.0.9 tries to use /usr/include/SDL from buildhost and fails with QA Cross Compile Badness
-PREFERRED_VERSION_libsdl-ttf = "2.0.3"
diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc
index 6b4c494684..733b15e78b 100644
--- a/conf/distro/include/sane-srcrevs-fso.inc
+++ b/conf/distro/include/sane-srcrevs-fso.inc
@@ -7,13 +7,13 @@ SRCREV_pn-fsodatad ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-fsodeviced ?= "44a4aabf382995c9f3141ec09b202f0e569a484d"
 SRCREV_pn-fsogsmd ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-fsolocationd ?= "${FSO_CORNUCOPIA_SRCREV}"
-SRCREV_pn-fsomusicd ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-fsomusicd ?= "3233c80585dfbc0e77ee5549f9d7fb1a60b5a0f9"
 SRCREV_pn-fsonetworkd ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-fsotimed ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-fsotdld ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-fsousaged ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-libfsobasics ?= "${FSO_CORNUCOPIA_SRCREV}"
-SRCREV_pn-libfsoframework ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-libfsoframework ?= "c227502c59f4d1de3b3097b3329c2461d6cfa2a2"
 SRCREV_pn-libfsotransport ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-libfsoresource ?= "${FSO_CORNUCOPIA_SRCREV}"
 
@@ -38,6 +38,7 @@ SRCREV_pn-libpersistence ?= "217ad803745f8ac1f3c72c6715e2c0faefb3fd06"
 FSO_PYTHONHELPERS_SRCREV ?= "63b1dff1bc8ac22efabcee8a90e957c3b2423317"
 SRCREV_pn-mickeydbus ?= "${FSO_PYTHONHELPERS_SRCREV}"
 SRCREV_pn-mickeyterm ?= "${FSO_PYTHONHELPERS_SRCREV}"
+SRCREV_pn-msmcommd ?= "072226ac1e0f21735cb3bc26cdb87cd87e347afb"
 SRCREV_pn-multicat ?= "${FSO_PYTHONHELPERS_SRCREV}"
 SRCREV_pn-python-pyrtc ?= "${FSO_PYTHONHELPERS_SRCREV}"
 SRCREV_pn-pycd ?= "${FSO_PYTHONHELPERS_SRCREV}" 
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 9bcb10b4c1..0e46dd3828 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -181,7 +181,7 @@ SRCREV_pn-mplayer-maemo ?= "342"
 SRCREV_pn-msn-pecan ?= "e795b33b29d792f19fcf699275eb966dc68be257"
 SRCREV_pn-multitap-pad ?= "373"
 SRCREV_pn-mux ?= "72460e890dbb15edbf7dc193116be0dcf9794a8b"
-SRCREV_pn-navit ?= "2890"
+SRCREV_pn-navit ?= "2902"
 SRCREV_pn-navit-icons ?= "2871"
 SRCREV_pn-neod ?= "4617"
 SRCREV_pn-neomis ?= "6"
@@ -262,7 +262,7 @@ SRCREV_pn-phoneui-apps ?= "c27e620302d0ea956da777f76a4aa217ae8366c6"
 SRCREV_pn-phoneuid ?= "215e0b6e021e27cd042d675ec91d501a03211091"
 SRCREV_pn-portaudio-v19 ?= "1387"
 SRCREV_pn-psplash ?= "249"
-SRCREV_pn-pty-forward-native ?= "a41cae9df1af4fc710c701ac01016d3668dd5fba"
+SRCREV_pn-pty-forward-native ?= "4662b55fdba528bb5b3349f83055bf236af5d63b"
 SRCREV_pn-pyefl-sudoku ?= "49"
 SRCREV_pn-pygsm ?= "976477f6b403f422b4ea730f71ebf409f6671141"
 SRCREV_pn-pyphonelog ?= "45783c7fd5ec274421bf87a5cdb372c122370fda"
@@ -280,13 +280,13 @@ SRCREV_pn-qemu-native ?= "${QEMUSRCREV}"
 SRCREV_pn-qemu-sdk ?= "${QEMUSRCREV}"
 SRCREV_pn-qi ?= "c38b062a609f1442e6a9e13005cfbdfd59a5ac0d"
 SRCREV_pn-qi-ubi ?= "c38b062a609f1442e6a9e13005cfbdfd59a5ac0d"
-SRCREV_pn-qtwebkit-performance-utilities ?= "8a39befbf5bb20dba1e5317ae55a968292d38afe"
-SRCREV_pn-qtwebkit-performance-utilities-e ?= "8a39befbf5bb20dba1e5317ae55a968292d38afe"
+SRCREV_pn-qtwebkit-performance-utilities ?= "27a630a74518ebb7810ed5886182e676b36c07a5"
+SRCREV_pn-qtwebkit-performance-utilities-e ?= "27a630a74518ebb7810ed5886182e676b36c07a5"
 SRCREV_pn-remoko ?= "121"
 SRCREV_pn-remoko-server ?= "121"
 SRCREV_pn-s3c24xx-gpio ?= "4949"
 SRCREV_pn-s3c64xx-gpio ?= "4949"
-SRCREV_pn-serial-forward ?= "a41cae9df1af4fc710c701ac01016d3668dd5fba"
+SRCREV_pn-serial-forward ?= "4662b55fdba528bb5b3349f83055bf236af5d63b"
 SRCREV_pn-settings-daemon ?= "2006"
 SRCREV_pn-shr-config ?= "37dd7ac950e2bfd438801faf34c29fccfdbbaccf"
 SRCREV_pn-shr-contacts ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca"
diff --git a/conf/distro/jlime-2009.1.conf b/conf/distro/jlime-2009.1.conf
index 0d3cc0b908..72d89282c2 100644
--- a/conf/distro/jlime-2009.1.conf
+++ b/conf/distro/jlime-2009.1.conf
@@ -98,14 +98,17 @@ require conf/distro/include/sane-srcrevs.inc
 #
 # Framebuffer & X
 #
-PREFERRED_PROVIDER_virtual/libx11 = "diet-x11"
-PREFERRED_PROVIDER_tslib = "tslib"
-PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 require conf/distro/include/preferred-xorg-versions-X11R7.5.inc
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+PREFERRED_PROVIDER_virtual/libx11 = "libx11"
+PREFERRED_PROVIDER_virtual/libsdl = "libsdl-x11"
+PREFERRED_PROVIDER_tslib = "tslib"
+PREFERRED_VERSION_mesa = "7.6"
+PREFERRED_VERSION_mesa-dri = "7.6"
+PREFERRED_VERSION_mesa-xlib = "7.6"
 
 #
 # General Userspace
 #
+require conf/distro/include/preferred-opie-versions-1.2.4.inc
 PREFERRED_VERSION_cdparanoia  = "10.2"
-require conf/distro/include/preferred-opie-versions-1.2.4.inc
\ No newline at end of file
diff --git a/conf/distro/kaeilos.conf b/conf/distro/kaeilos.conf
index 03595dba1d..ee187ba0c9 100644
--- a/conf/distro/kaeilos.conf
+++ b/conf/distro/kaeilos.conf
@@ -3,7 +3,7 @@
 #@NAME: KaeilOS(R) - http://www.kaeilos.com
 #@DESCRIPTION: KaeilOS Linux Distribution for Kernel 2.6 based devices
 #@MAINTAINER: Marco Cavallini <m.cavallini@koansoftware.com>
-#@VERSION: 23-10-2009
+#@VERSION: 11-01-2010
 #
 # KaeilOS is a registered trade mark of KOAN - Bergamo - Italia
 # Product website : http://www.KaeilOS.com
@@ -59,6 +59,7 @@ CVS_TARBALL_STASH ?= "\
 		     http://www.angstrom-distribution.org/unstable/sources/ \
 		    "
 
+
 #Make sure we use 2.6 on machines with a 2.4/2.6 selector
 KERNEL = "kernel26"
 MACHINE_KERNEL_VERSION = "2.6"
@@ -72,29 +73,13 @@ PREFERRED_VERSION_linux-handhelds-2.6 ?= "2.6.21-hh20"
 #KERNEL_INITRAMFS_PATH = "${KERNEL_INITRAMFS_DIR}/$(readlink ${KERNEL_INITRAMFS_DIR}initramfs-bootmenu-image-${MACHINE}.cpio.gz)"
 
 #This is unrelated to the kernel version, but userspace apps (e.g. HAL) require a recent version to build against
-PREFERRED_VERSION_linux-libc-headers 	= "2.6.23"
+PREFERRED_VERSION_linux-libc-headers 	= "2.6.31"
 
 # see into glibc-package.bbclass : added KaeilOS hack supporting glibc 2.9
 PREFERRED_VERSION_glibc 		?= "2.9"
 PREFERRED_VERSION_glibc-initial 	?= "2.9"
-
-PREFERRED_VERSION_uclibc        	?= "0.9.30"
-PREFERRED_VERSION_uclibc-initial	?= "0.9.30"
-
-# Preferred provider for virtual/psplash
-# This enforces a specific brand to be used, in our case the angstrom
-# one. In case you want to change the logo or something like that we
-# suggest you to create another recipe (e.g: psplash-<brand>) for that
-# and add that into your image.
-# You can also opt to change or override this line, but that isn't
-# needed because psplash is using update-alternatives.
-#PREFERRED_PROVIDER_virtual/psplash               ?= "psplash-kaeilos"
-
-PREFERRED_PROVIDER_avahi = "avahi"
-PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb-compat"
-PREFERRED_PROVIDER_virtual/gail    ?= "gtk+"
-
-PREFERRED_PROVIDER_libfribidi = "fribidi"
+PREFERRED_VERSION_uclibc        	?= "0.9.30.1"
+PREFERRED_VERSION_uclibc-initial	?= "0.9.30.1"
 
 #powerpc needs additional patches to gcc
 ANGSTROM_GCC_VERSION_ppc405 		?= "4.1.1"
@@ -105,15 +90,20 @@ ANGSTROM_GCC_VERSION_xilinx-ml403	?= "4.1.1"
 ANGSTROM_GCC_VERSION_bfin			= "4.1.2"
 
 # Uncomment this if want need to build an armv7a kernel with CSL toolchain (<2.6.27 don't boot with mainline gcc)
-#KERNEL_CCSUFFIX_armv7a= "-4.2.1+csl-arm-2007q3-53"
+#KERNEL_CCSUFFIX_armv7a = "-4.2.1+csl-arm-2007q3-53"
+KERNEL_CCSUFFIX_archos5 = "-4.2.1+csl-arm-2007q3-53"
 
 #avr32 only has support for gcc 4.2.2
 ANGSTROM_GCC_VERSION_avr32		?= "4.2.2"
 
+#armv4 needs at least gcc 4.4.2 for eabi
+ANGSTROM_GCC_VERSION_armv4              ?= "4.4.2"
+
 #Everybody else can just use this: 
 ANGSTROM_GCC_VERSION                     ?= "4.3.3"
 
 ANGSTROM_BINUTILS_VERSION                ?= "2.18"
+ANGSTROM_BINUTILS_VERSION_armv4          ?= "2.20"
 ANGSTROM_BINUTILS_VERSION_armv7a         ?= "2.18.50.0.7"
 
 PREFERRED_VERSION_binutils               ?= "${ANGSTROM_BINUTILS_VERSION}"
@@ -134,71 +124,29 @@ PREFERRED_VERSION_binutils-cross-sdk_avr32 = "2.17"
 # Toolchain virtuals:
 require conf/distro/include/toolchain-${TOOLCHAIN_TYPE}.inc
 
-# hostap stuff, we prefer the in-kernel modules, but those don't work for all machines
-PREFERRED_PROVIDER_hostap-conf                      ?= "hostap-conf"
-PREFERRED_PROVIDER_hostap-modules_h2200             ?= "hostap-modules"
-PREFERRED_PROVIDER_hostap-modules_hx4700            ?= "hostap-modules"
-
-PREFERRED_PROVIDER_virtual/db           ?= "db"
-PREFERRED_PROVIDER_virtual/db-native    ?= "db-native"
-PREFERRED_PROVIDER_virtual/libsdl       ?= "libsdl-x11"
-PREFERRED_PROVIDER_virtual/libx11       ?= "libx11"
-
-# Others:
 PREFERRED_PROVIDER_dbus-glib             = "dbus-glib"
-PREFERRED_PROVIDER_esound               ?= "pulseaudio"
-PREFERRED_PROVIDER_gconf                ?= "gconf"
-PREFERRED_PROVIDER_gnome-vfs            ?= "gnome-vfs"
-PREFERRED_PROVIDER_gnome-vfs-plugin-file ?= "gnome-vfs"
-PREFERRED_PROVIDER_tslib                ?= "tslib"
-PREFERRED_PROVIDER_tslib-conf           ?= "tslib"
-PREFERRED_PROVIDER_libgpewidget         ?= "libgpewidget"
-PREFERRED_PROVIDER_ntp                  ?= "ntp"
 PREFERRED_PROVIDER_hotplug               = "udev"
-PREFERRED_PROVIDER_opkg                 ?= "opkg-nogpg"
-PREFERRED_PROVIDER_libxss                = "libxss"
-PREFERRED_PROVIDER_bluez-utils-dbus      = "bluez-utils"
-PREFERRED_PROVIDER_bluez-libs            = "bluez4"
-PREFERRED_PROVIDER_bluez-utils           = "bluez4"
-PREFERRED_PROVIDER_util-linux            = "util-linux-ng"
+PREFERRED_PROVIDER_opkg                 ?= "opkg-nogpg-nocurl"
 
 # see recipes/bluez/bluez4*.bb for further dependencies of this setting 
 ANGSTROM_BLACKLIST_pn-bluez-libs	= "bluez-libs 3.x has been replaced by bluez4"
 ANGSTROM_BLACKLIST_pn-bluez-utils	= "bluez-utils 3.x has been replaced by bluez4"
 
-# we don't ship gtk-directfb by default
-PREFERRED_PROVIDER_gtk+                   ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-ani  ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-bmpg ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-gif  ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-ico  ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-jpeg ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-pcx  ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-png  ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-pnm  ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-ras  ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-tga  ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm  ?= "gtk+"
-PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm  ?= "gtk+"
-
-#Silence a warning during parsing
-PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
-
-#This is needed to get a correct PACKAGE_ARCH for packages that have PACKAGE_ARCH = ${MACHINE_ARCH}
-ARM_ABI ?= "${@['','oabi'][bb.data.getVar('MACHINE',d) in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}"
-require conf/distro/include/kaeilos.inc
-
+ANGSTROM_BLACKLIST_pn-fso-apm       = "regular apmd is good enough"
 
+require conf/distro/include/kaeilos.inc
 
 # If we're using an .ipk based rootfs, we want to have opkg-nogpg installed so postinst script can run
 # We also take this opportunity to inject angstrom-version and the feed configs into the rootfs
-IPKG_VARIANT = "opkg-nogpg angstrom-version ${ANGSTROM_FEED_CONFIGS}"
+IPKG_VARIANT = "opkg-nogpg-nocurl angstrom-version ${ANGSTROM_FEED_CONFIGS}"
+
+# we need the same provider for opkg and u-a
+PREFERRED_PROVIDER_virtual/update-alternatives = "opkg-nogpg-nocurl"
 
 # Select xserver-xorg as default, since kdrive has been EOL'ed
 XSERVER ?= "xserver-xorg xf86-input-evdev xf86-input-keyboard xf86-input-mouse xf86-video-fbdev" 
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
-PREFERRED_PROVIDER_xserver ?= "xserver-xorg"
+#PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+#PREFERRED_PROVIDER_xserver ?= "xserver-xorg"
 
 # do some task-base stuff here
 
diff --git a/conf/distro/minimal.conf b/conf/distro/minimal.conf
index 62e76154e1..8e0ae2eb34 100644
--- a/conf/distro/minimal.conf
+++ b/conf/distro/minimal.conf
@@ -52,10 +52,11 @@ INHERIT += "packaged-staging"
 # Chose the packaging system
 INHERIT += "package_ipk"
 IMAGE_FSTYPES ?= "tar.gz jffs2"
-
-require conf/distro/include/sane-feed.inc
 PREFERRED_PKG_FORMAT ?= "ipk"
-require conf/distro/include/sane-feed-${PREFERRED_PKG_FORMAT}.inc
+
+# Put links to sources in deploy/sources to make it easier for people to be GPL compliant
+INHERIT += "src_distribute_local"
+SRC_DIST_LOCAL ?= "symlink"
 
 # If we're using an .ipk based rootfs, we want to have opkg-nogpg installed so postinst script can run
 IPKG_VARIANT = "opkg-nogpg"
@@ -68,6 +69,7 @@ IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${LIBC}-${PREFERRED_PKG_FORMAT}-$
 CACHE ?= "${TMPDIR}/cache/${LIBC}/${MACHINE}"
 DEPLOY_DIR ?= "${TMPDIR}/deploy/${LIBC}"
 DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE}"
+SPLASH ?= "${@base_contains("MACHINE_FEATURES", "screen", "psplash", "",d)}"
 
 # increase inode/block ratio for ext2 filesystem 
 EXTRA_IMAGECMD_ext2 = "-i 8192"
diff --git a/conf/distro/sharprom-compatible.conf b/conf/distro/sharprom-compatible.conf
index 2ef04872fb..0e8e272b11 100644
--- a/conf/distro/sharprom-compatible.conf
+++ b/conf/distro/sharprom-compatible.conf
@@ -54,6 +54,7 @@ PREFERRED_PROVIDER_virtual/arm-linux-gcc-initial = "sharprom-toolchain-native"
 PREFERRED_PROVIDER_virtual/arm-linux-gcc-intermediate = "sharprom-toolchain-native"
 
 PREFERRED_VERSION_glibc = "2.2.5"
+PREFERRED_VERSION_linux-libc-headers = "2.4.18"
 
 IPKGBUILDCMD = "ipkg-build -c -o 0 -g 0"
 #INHIBIT_PACKAGE_STRIP = "1"
diff --git a/conf/machine/akita.conf b/conf/machine/akita.conf
index 6f71787fa1..9930c89c6a 100644
--- a/conf/machine/akita.conf
+++ b/conf/machine/akita.conf
@@ -21,7 +21,3 @@ MACHINE_DISPLAY_PPI = "216"
 UBOOT_MACHINE = "akita_config"
 UBOOT_ENTRYPOINT = "0xA1000000"
 UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}"
-
-# xserver-kdrive 1.3.0.0 is still the only working version:
-XSERVER = "xserver-kdrive-1300-fbdev"
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-1300"
diff --git a/conf/machine/c7x0.conf b/conf/machine/c7x0.conf
index 16073fee82..4daedde482 100644
--- a/conf/machine/c7x0.conf
+++ b/conf/machine/c7x0.conf
@@ -15,8 +15,6 @@ require conf/machine/include/zaurus-clamshell.inc
 # please set the right value in your local.conf
 ROOT_FLASH_SIZE = "25"
 
-XSERVER = "xserver-kdrive-imageon"
-
 MACHINE_GUI_CLASS = "bigscreen"
 MACHINE_DISPLAY_WIDTH_PIXELS = "640"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "480"
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index 47f6e30dfd..66995e9b09 100644
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -9,8 +9,6 @@ ROOT_FLASH_SIZE = "14"
 # actually 14680064
 EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
 
-XSERVER = "xserver-kdrive-fbdev"
-
 MACHINE_GUI_CLASS = "smallscreen"
 MACHINE_DISPLAY_WIDTH_PIXELS = "240"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
diff --git a/conf/machine/include/davinci.inc b/conf/machine/include/davinci.inc
index bd8401a020..a262059d45 100644
--- a/conf/machine/include/davinci.inc
+++ b/conf/machine/include/davinci.inc
@@ -1,7 +1,7 @@
 require conf/machine/include/tune-arm926ejs.inc
 
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r31"
+MACHINE_KERNEL_PR = "r32"
 
 TARGET_ARCH = "arm"
 
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index cd83a7b5a6..02a48629c8 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -17,9 +17,28 @@ EXTRA_IMAGEDEPENDS += "zaurus-installer"
 SERIAL_CONSOLE = "115200 ttyS0"
 SERIAL_CONSOLE_collie = "115200 ttySA0"
 
+# FIXME: xserver-xorg is in testing
+
+# deprecated defaults
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+XSERVER = "xserver-kdrive-fbdev"
+
+# c7x0 uses kdrive-imageon (W100)
 PREFERRED_PROVIDER_virtual/xserver_c7x0 = "xserver-kdrive-imageon"
+XSERVER_c7x0 = "xserver-kdrive-imageon"
+
+# collie uses kdrive-fbdev
 PREFERRED_PROVIDER_virtual/xserver_collie = "xserver-kdrive-fbdev"
+XSERVER_collie = "xserver-kdrive-fbdev"
+
+# FIXME xserver-kdrive 1.3.0.0 is still the only working version ?
+PREFERRED_PROVIDER_virtual/xserver_akita = "xserver-kdrive-1300"
+XSERVER_akita = "xserver-kdrive-1300-fbdev"
+
+# spitz uses xserver-xorg
+PREFERRED_PROVIDER_virtual/xserver_spitz = "xserver-xorg"
+XSERVER_spitz = "xserver-xorg xf86-input-keyboard xf86-input-mouse xf86-input-evdev"
+PREFERRED_PROVIDER_virtual/libgl_spitz = "mesa-dri"
 
 PCMCIA_MANAGER ?= "pcmciautils"
 
diff --git a/conf/machine/jornada6xx.conf b/conf/machine/jornada6xx.conf
index c5249d94ef..f709f51c09 100644
--- a/conf/machine/jornada6xx.conf
+++ b/conf/machine/jornada6xx.conf
@@ -6,9 +6,16 @@ TARGET_ARCH = "sh3"
 
 require conf/machine/include/tune-sh3.inc
 
+MACHINE_FEATURES = "kernel26 alsa pcmcia irda keyboard touchscreen screen vfat"
+MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
+
 PREFERRED_PROVIDER_virtual/kernel = "linux-jlime-jornada6xx"
-PREFERRED_VERSION_linux-jlime-jornada6xx = "2.6.17"
+PREFERRED_VERSION_linux-jlime-jornada6xx = "2.6.32"
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+XSERVER = "xserver-xorg \
+           xf86-input-evdev \
+           xf86-input-tslib \
+           xf86-video-fbdev"
 
-MACHINE_FEATURES = "kernel26 pcmcia irda keyboard touchscreen screen vfat"
-MACHINE_EXTRA_RRECOMMENDS = " kernel-modules"
 PCMCIA_MANAGER = "pcmciautils"
\ No newline at end of file
diff --git a/conf/machine/spitz.conf b/conf/machine/spitz.conf
index 0d79977180..4fe62b5f43 100644
--- a/conf/machine/spitz.conf
+++ b/conf/machine/spitz.conf
@@ -27,7 +27,3 @@ MACHINE_DISPLAY_PPI = "216"
 UBOOT_MACHINE = "akita_config"
 UBOOT_ENTRYPOINT = "0xA1000000"
 UBOOT_LOADADDRESS = "${UBOOT_ENTRYPOINT}"
-
-XSERVER = "xserver-xorg xf86-input-keyboard xf86-input-mouse xf86-input-evdev"
-PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
-PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"