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

15 files changed, 103 insertions, 45 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index e1ece84b8a..569be38ea6 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -7174,6 +7174,10 @@ sha256=84fa995c461066ed39c587c834414ef1a320f605b6b6e1db2d10d12fa6a587db
 md5=2dfdb9b44a1a08a675985bb92d1439e6
 sha256=4a0d868889d5221cc6e4b96f6e8de19bd4fc770fa8e05012c6c169686088088b
 
+[ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/1.1.10/fltk-1.1.10-source.tar.bz2]
+md5=a1765594bc427ff892e36089fe1fa672
+sha256=37ada22bf2586b8dd30d84209b8b58bdcb864627e5d02ae3f2c323a29261b19a
+
 [ftp://ftp-fourier.ujf-grenoble.fr/xcas/devel/sources/fltk-1.1.4-device.tar.gz]
 md5=826c6afa88c9c4da734fe7393ed59639
 sha256=a0e31ad5088414aaee003586a23127a5ace7717ba4f8fb4e02cf56bb9a5c30f4
@@ -8834,6 +8838,10 @@ sha256=f4055ea8f1815d7dcca6bf0159af70489243d63a14dcfaf2a994af062d829ca8
 md5=39c30867511b79391eb9177c86c8b79a
 sha256=08e4d272471d377cd7c6cac6a6089a540436961c00ddd09de4f29a3148ec71ef
 
+[ftp://ftp.gimp.org/pub/gimp/v2.6/gimp-2.6.8.tar.bz2]
+md5=a4d9462c9420954824a80c9b1963f9d9
+sha256=d5d4218b742390157fca23a9d2cce436904546a2ea419ffeb44a5f43c99a3332
+
 [http://downloads.sourceforge.net/g-inspector/ginspector-20050529.tar.bz2]
 md5=0a8474e0d90b139b1baa70b097a4fd51
 sha256=7f55ec02b5ab9e86c64f5718be64854fd9c64899908e580e1a9759421ac3b436
@@ -12322,6 +12330,10 @@ sha256=3ba0bdf71376429bb3ce8ae51595fc25e6a5147cdcc26e47b6da17386eb78cdf
 md5=e80a6739ead9a260087fe4d3fc6a8359
 sha256=9f90613de73e1b8e90d9bbcb09046e83680f15a46fc630c3e26e9aa4ca0e6a1d
 
+[https://launchpad.net/ubuntu/lucid/+source/human-icon-theme/0.35/+files/human-icon-theme_0.35.tar.gz]
+md5=dd9bad3b7f95619a6536932300fe202a
+sha256=d234a562fc4af10982b138b3e67e7f61f44b572d0493c776e639508e4faa0a29
+
 [http://downloads.sourceforge.net/hunkyfonts/hunkyfonts-0.3.0.tar.bz2]
 md5=36444795a356fb8a56c63b2840729bab
 sha256=e0b1849c545b6af276407d93025c73094dd74fc259b07c1d91594fdbb9a0b829
@@ -13054,6 +13066,10 @@ sha256=62a6f9cb90999694e48528e16f427433c13a99424b5dca4cb38cda99e13d10e8
 md5=ebef12559268e2c5ea932cbb5aaa789e
 sha256=62a6f9cb90999694e48528e16f427433c13a99424b5dca4cb38cda99e13d10e8
 
+[http://wireless.kernel.org/download/iw/iw-0.9.18.tar.bz2]
+md5=9734080d8a5c4b768c5e0da665a48950
+sha256=b02e26efc72cb23129431e478dbb2f2abd16e8cc4f4130762d98c54f106aabd0
+
 [http://www.kokkinizita.net/linuxaudio/downloads/jaaa-0.4.2.tar.bz2]
 md5=e3013bb1e287b495b0668f4b6e2887c7
 sha256=0bae72d819963c40e0a202bb08bc55a600fe7c453749601a3836bc9272cffb3a
@@ -15702,6 +15718,10 @@ sha256=3453c1426fdc06b32bc5f4e7d3ce039ec7f38f0fa4018d505e515099b209dd25
 md5=7ee7d8c834f1e06093130a86cbb9e79a
 sha256=3453c1426fdc06b32bc5f4e7d3ce039ec7f38f0fa4018d505e515099b209dd25
 
+[http://launchpad.net/liblauncher/0.1/0.1.8/+download/liblauncher-0.1.8.tar.gz]
+md5=b220357aaccc581c05337d05c5a1356f
+sha256=e2d7c0eb9702e83e28551b89e3cbc283c6835e42c8336bd251c3b5c50dfdc9e5
+
 [http://xorg.freedesktop.org/releases/individual/lib/liblbxutil-1.0.1.tar.bz2]
 md5=b73cbd5bc3cd268722a624a5f1318fde
 sha256=94c31c7090106d3a95e2a7c083961efca1321b970118fe103ab06e5d927b7258
@@ -19858,6 +19878,10 @@ sha256=aa54d1822f8505f600b4c8d5debdf289b956b3b86bfd72e2ba02026352c107fc
 md5=b6e67a96e2f84bb70912da8c7e0d5ec1
 sha256=e836560ffae454d4ca0c4cacd1f2a3e8528c5744372a77968bba3b947328ca38
 
+[http://launchpad.net/launch-lite-proj/trunk/alpha-0.2.0/+download/netbook-launcher-efl-0.2.0.0.tar.gz]
+md5=33088cb4a03b71082f2722b40cef11e0
+sha256=04e6f182f7d1421d06597c5b0909810b9db836a40763d92df0d1a6c798ccb61f
+
 [http://downloads.sourceforge.net/netcat/netcat-0.7.1.tar.bz2]
 md5=0a29eff1736ddb5effd0b1ec1f6fe0ef
 sha256=b55af0bbdf5acc02d1eb6ab18da2acd77a400bafd074489003f3df09676332bb
@@ -21850,6 +21874,10 @@ sha256=2f79da1f127dd05f9404494ebc794f8cda919764fd2424f79df31f3b0f9dfd21
 md5=a1bbb3c9be7d4ee1f53590d319cbfa72
 sha256=acbadfd4d725e628ab8906f87438b26ebf86e67d219bbdcf07a9ccd18bdaafd6
 
+[http://downloads.sourceforge.net/pidgin/pidgin-2.6.4.tar.bz2]
+md5=6e1dc8b9dd6983a54ff3a6de33efa778
+sha256=fa907ace507708e4a4bae32cc81a6271fb6da8bc0458fd8fc97cc4429ec8be11
+
 [ftp://ftp.cac.washington.edu/pine/pine4.64.tar.Z]
 md5=75af127948cc0c701d424d22d621f792
 sha256=62c7b97695cb486e420afbbbe21bef853dd68a71665d867ffef50cb34dfba5f4
@@ -25810,6 +25838,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
@@ -27374,6 +27406,22 @@ sha256=5f810c66d35ecea5f77ca6ed87fb3ba394c700dcbcaec5f04872a4c5340a5622
 md5=22eb478f18a623a2983bd401a3de0683
 sha256=a074f50cf1ee3bb4118c2639ad600baa789f5bfe35d1e6f3377179ab02b52af8
 
+[http://www.freesmartphone.org/sources/vala-0.7.9.4.tar.bz2]
+md5=036faac08ab0898811e6bb92b5fba8de
+sha256=debefbb3ea7ae8318f6f5a064e593ecd1d93ba6c5c86c14019800f724c46690e
+
+[http://www.freesmartphone.org/sources/vala-0.7.9.5.tar.bz2]
+md5=147b5b9c37d4e2d814f582d6cf78c96a
+sha256=e1d6e89eb8689fb3422502a9020a39fff0a5e6ddb3eb47eed9ac9a00636e06b0
+
+[http://www.freesmartphone.org/sources/vala-0.7.9.6.tar.bz2]
+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/compatibility-providers.conf b/conf/compatibility-providers.conf
index 10a81f2943..0d8e9bcaf7 100644
--- a/conf/compatibility-providers.conf
+++ b/conf/compatibility-providers.conf
@@ -47,7 +47,8 @@ PREFERRED_PROVIDER_openmoko-alsa-scenarios ?= "alsa-scenarii-shr"
 PREFERRED_PROVIDER_opkg ?= "opkg"
 #PREFERRED_PROVIDER_opkg ?= "opkg-nogpg"
 PREFERRED_PROVIDER_qemu-native ?= "qemu-native"
-PREFERRED_PROVIDER_qt4x11 ?= "qt4-x11-free"
+PREFERRED_PROVIDER_qt4-embedded ?= "qt4-embedded"
+PREFERRED_PROVIDER_qt4-x11-free ?= "qt4-x11-free"
 PREFERRED_PROVIDER_task-bootstrap ?= "task-bootstrap"
 PREFERRED_PROVIDER_tslib-conf ?= "tslib"
 PREFERRED_PROVIDER_tslib ?= "tslib"
diff --git a/conf/distro/include/preferred-xorg-versions-X11R7.5.inc b/conf/distro/include/preferred-xorg-versions-X11R7.5.inc
index 6e8c93a95a..368f766a5b 100644
--- a/conf/distro/include/preferred-xorg-versions-X11R7.5.inc
+++ b/conf/distro/include/preferred-xorg-versions-X11R7.5.inc
@@ -229,6 +229,9 @@ PREFERRED_VERSION_libfontenc-native ?= "1.0.5"
 PREFERRED_VERSION_libpciaccess ?= "0.10.9"
 PREFERRED_VERSION_libxkbfile ?= "1.0.6"
 PREFERRED_VERSION_libxkbfile-native ?= "1.0.6"
+PREFERRED_VERSION_mesa ?= "7.2"
+PREFERRED_VERSION_mesa-dri ?= "7.2"
+PREFERRED_VERSION_mesa-xlib ?= "7.2"
 PREFERRED_VERSION_xtrans ?= "1.2.5"
 PREFERRED_VERSION_xtrans-native ?= "1.2.5"
 
diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc
index d4dfd87521..3b58c1ac25 100644
--- a/conf/distro/include/sane-srcrevs-fso.inc
+++ b/conf/distro/include/sane-srcrevs-fso.inc
@@ -1,47 +1,47 @@
 # To be included from sane-srcrevs.inc
 
 # FSO Projects -- Cornucopia
-FSO_CORNUCOPIA_SRCREV ?= "1dcf546fb0423930f938129a51f538874c172226"
+FSO_CORNUCOPIA_SRCREV ?= "70b87d6e8b04f0bf0078702f6467e037eb4fdb28"
 SRCREV_pn-fso-apm ?= "${FSO_CORNUCOPIA_SRCREV}"
-SRCREV_pn-fsodatad ?= "1b329ccc044eb087a6f8a7c7c61022c162f51ab2"
-SRCREV_pn-fsodeviced ?= "1b329ccc044eb087a6f8a7c7c61022c162f51ab2"
+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 ?= "1b329ccc044eb087a6f8a7c7c61022c162f51ab2"
+SRCREV_pn-fsomusicd ?= "3233c80585dfbc0e77ee5549f9d7fb1a60b5a0f9"
 SRCREV_pn-fsonetworkd ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-fsotimed ?= "${FSO_CORNUCOPIA_SRCREV}"
-SRCREV_pn-fsotdld ?= "5702931bf6a2a796fde6abdf1909d5901216bee7"
-SRCREV_pn-fsousaged ?= "fe2ec3260b73233c414de584aa1b4a5e49c24a0d"
-SRCREV_pn-libfsobasics ?= "18d4114d295617c6fb611f3c804e1980b896fc14"
-SRCREV_pn-libfsoframework ?= "690dc75efcc8e4dbcb53e361d48c54e104955921"
+SRCREV_pn-fsotdld ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-fsousaged ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-libfsobasics ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-libfsoframework ?= "c227502c59f4d1de3b3097b3329c2461d6cfa2a2"
 SRCREV_pn-libfsotransport ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-libfsoresource ?= "${FSO_CORNUCOPIA_SRCREV}"
 
 # FSO Projects -- Misc
 SRCREV_pn-dbus-hlid ?= "5df7f49fe8881804aaab544a569fd164c3e93afb"
-SRCREV_pn-frameworkd ?= "d48bd43c430322b26744e31829f9c76e9b725819"
+SRCREV_pn-frameworkd ?= "439300083459fe66cb93aca20cee185f6fcc52f5"
 SRCREV_pn-frameworkd-config-shr_FSO_REV ?= ${SRCREV_pn-frameworkd}
-SRCREV_pn-fso-abyss ?= "7f271311e2e0b63235139859169bd248920ade30"
+SRCREV_pn-fso-abyss ?= "aaa3c48296c8589d845f2b6e4314b794750d91cc"
 SRCREV_pn-fso-term ?= "aa0b9c26dee3918a5e9d2809bb36335bda276a0d"
 SRCREV_pn-fso-gpsd ?= "39e810899110a9bb302cf2064e1c0f73541fb4e6"
 SRCREV_pn-fso-gsm0710muxd ?= "abcbcd7cc532a8834906de3fc24c8f8fe7643cd4"
 SRCREV_pn-fso-monitord ?= "b4ae1e9b10e710042624c2cf1a15b91a7d5b1d44"
 SRCREV_pn-fso-sounds ?= "3a4767ec01988bd0fd8f72f0c35d6d36e5fbc815"
-SRCREV_pn-fso-specs ?= "14de522adbea80416df811085b3112cd1d5d5336"
+SRCREV_pn-fso-specs ?= "60580a3fc3e8b2c036f9734c59994a5175bfcc1e"
 SRCREV_pn-gsmd2 ?= "c16883a079aeff8780e5d461ec4e8348537ab4d8"
-SRCREV_pn-libeflvala ?= "d07db4fbd24c9d5dfc9b1fd5024fd651b02f123e"
-SRCREV_pn-libfso-glib ?= "9a627aa1c33f5a46ae4316fc274126ca5f37e979"
+SRCREV_pn-libeflvala ?= "707ca862f11feb4fa6945c222a34272b8fd3aebb"
+SRCREV_pn-libfso-glib ?= "4016a7ff20cf53403ab22877eef3a706607f25a3"
 SRCREV_pn-libframeworkd-glib ?= "bdea2ad33bb5c5aa2b996712b99e8dd9b58aed7d"
 SRCREV_pn-libgsm0710 ?= "cd564c8782f018e0d65fb8716c99a6040b5bd166"
-SRCREV_pn-libgsm0710mux ?= "e81ed512ec86e31d0d0119826afa9d1302651693"
-SRCREV_pn-libpersistence ?= "26180fd3c0fe4eb6abb7440f10e51d997719b97a"
+SRCREV_pn-libgsm0710mux ?= "b6793a8191f20adba31b93b2f337cc5451270cf9"
+SRCREV_pn-libpersistence ?= "217ad803745f8ac1f3c72c6715e2c0faefb3fd06"
 FSO_PYTHONHELPERS_SRCREV ?= "63b1dff1bc8ac22efabcee8a90e957c3b2423317"
 SRCREV_pn-mickeydbus ?= "${FSO_PYTHONHELPERS_SRCREV}"
 SRCREV_pn-mickeyterm ?= "${FSO_PYTHONHELPERS_SRCREV}"
 SRCREV_pn-multicat ?= "${FSO_PYTHONHELPERS_SRCREV}"
 SRCREV_pn-python-pyrtc ?= "${FSO_PYTHONHELPERS_SRCREV}"
 SRCREV_pn-pycd ?= "${FSO_PYTHONHELPERS_SRCREV}" 
-SRCREV_pn-vala-dbus-binding-tool-native ?= "324a78c0cab484535ce5a7a33436e9c62311297d"
+SRCREV_pn-vala-dbus-binding-tool-native ?= "11e5b817f569e3ce81fa94ed77ed529101368b7f"
 SRCREV_pn-vala-terminal ?= "932285d72e26b965c488f8aa99fe51f7a34231ad"
-SRCREV_pn-vala-native ?= "2f14aed36765c842fe7b4035ba564d2c023ef0b0"
+SRCREV_pn-vala-native ?= "a8aa50a80bcdc5f6c8183507f87b6c6fdfac8d9f"
 SRCREV_pn-zhone ?= "d654b3d15500a56c8e987e4d2cc2f8eef70b78c0"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 3cddffda50..7f1f7742ce 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -149,8 +149,8 @@ SRCREV_pn-linux-openmoko-2.6.24 ?= "fb42ce6724576fc173faf8abfb04aa2c36d213b7"
 SRCREV_pn-linux-openmoko-2.6.28 ?= "8c65792a5c83c76d662a617a7c4e1ae8104bb6a5"
 SRCREV_pn-linux-openmoko-2.6.31 ?= "4331f6c95fadc37ea89359d6afb915be838790f9"
 SRCREV_pn-linux-openmoko-2.6.32 ?= "5e5d518ecad86cc891d91c88d3b144eb30339bca"
-SRCREV_pn-linux-openmoko-devel ?= "b9aa5bf345a0b802af0d10b6cf1079738fe4fd12"
-SRCREV_pn-linux-openmoko-shr-devel ?= "b90406de472c1aa5371ab593a2bb79136d5de658"
+SRCREV_pn-linux-openmoko-devel ?= "a15608f241a40b41fed5bffe511355c2067c4e88"
+SRCREV_pn-linux-openmoko-shr-devel ?= "a15608f241a40b41fed5bffe511355c2067c4e88"
 SRCREV_pn-linux-openmoko-shr-drm-devel ?= "dd6196f5cc0cd707e7f694f52d7e847e066a1967"
 SRCREV_pn-linux-sgh-i900 ?= "7e5f8bd3864485e5fc66cb946e09f18b5a32cebc"
 SRCREV_pn-llvm-gcc4 ?= "374"
@@ -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"
@@ -280,8 +280,10 @@ SRCREV_pn-qemu-native ?= "${QEMUSRCREV}"
 SRCREV_pn-qemu-sdk ?= "${QEMUSRCREV}"
 SRCREV_pn-qi ?= "c38b062a609f1442e6a9e13005cfbdfd59a5ac0d"
 SRCREV_pn-qi-ubi ?= "c38b062a609f1442e6a9e13005cfbdfd59a5ac0d"
-SRCREV_pn-remoko ?= "148"
-SRCREV_pn-remoko-server ?= "148"
+SRCREV_pn-qtwebkit-performance-utilities ?= "8a39befbf5bb20dba1e5317ae55a968292d38afe"
+SRCREV_pn-qtwebkit-performance-utilities-e ?= "8a39befbf5bb20dba1e5317ae55a968292d38afe"
+SRCREV_pn-remoko ?= "121"
+SRCREV_pn-remoko-server ?= "121"
 SRCREV_pn-s3c24xx-gpio ?= "4949"
 SRCREV_pn-s3c64xx-gpio ?= "4949"
 SRCREV_pn-serial-forward ?= "a41cae9df1af4fc710c701ac01016d3668dd5fba"
@@ -301,7 +303,7 @@ SRCREV_pn-shr-splash-theme-logo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
 SRCREV_pn-shr-splash-theme-niebiee ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
 SRCREV_pn-shr-splash-theme-simple ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
 SRCREV_pn-shr-splash-theme-tux ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
-SRCREV_pn-shr-theme ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca"
+SRCREV_pn-shr-theme ?= "730da87ad75c814c16c856ca138605d985b6efdb"
 SRCREV_pn-shr-theme-gtk-e17lookalike ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
 SRCREV_pn-shr-today ?= "7b69649a9df0e85f0c0f7985fd1d93543c3b11e2"
 SRCREV_pn-shr-wizard ?= "24450cba257e7057045ad576530f158a03bd0f8b"
@@ -332,7 +334,7 @@ SRCREV_pn-xserver-kdrive-glamo ?= "9b28d998424c77fbc057dd3a022ccbb122793a52"
 # Enlightenment Foundation Libraries
 # Caution: This is not alphabetically, but (roughly) dependency-sorted.
 # Please leave it like that.
-EFL_SRCREV ?= "44908"
+EFL_SRCREV ?= "44950"
 SRCREV_pn-edb-native ?= "${EFL_SRCREV}"
 SRCREV_pn-edb ?= "${EFL_SRCREV}"
 SRCREV_pn-eina-native ?= "${EFL_SRCREV}"
diff --git a/conf/distro/kaeilos.conf b/conf/distro/kaeilos.conf
index 4d790f4e1f..03595dba1d 100644
--- a/conf/distro/kaeilos.conf
+++ b/conf/distro/kaeilos.conf
@@ -182,10 +182,6 @@ PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp ?= "gtk+"
 PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm  ?= "gtk+"
 PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm  ?= "gtk+"
 
-# QT stuff:
-# There are several flavours of qt4x11 in OE, so lets pick one that is buildable for everyone
-PREFERRED_PROVIDER_qt4x11 ?= "qt4-x11-free"
-
 #Silence a warning during parsing
 PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap"
 
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/distro/shr.conf b/conf/distro/shr.conf
index b99c895dc2..74526d0296 100644
--- a/conf/distro/shr.conf
+++ b/conf/distro/shr.conf
@@ -25,8 +25,8 @@ DISTRO_NAME = "shr"
 DISTRO_VERSION = "-${DATE}"
 DISTRO_REVISION = "2"
 DISTRO_PR = ".4"
-#DISTRO_TYPE = "release"
-DISTRO_TYPE = "debug"
+DISTRO_TYPE = "release"
+#DISTRO_TYPE = "debug"
 DISTRO = "shr"
 
 DISTRO_SSH_DAEMON = "openssh"
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/dm365-evm.conf b/conf/machine/dm365-evm.conf
index 1fd51234e2..5a5161673b 100644
--- a/conf/machine/dm365-evm.conf
+++ b/conf/machine/dm365-evm.conf
@@ -5,4 +5,4 @@
 require conf/machine/include/davinci.inc
 require conf/machine/include/dm365.inc
 
-UBOOT_MACHINE = "davinci_dm365evm_config"
+UBOOT_MACHINE = "davinci_dm365_evm_config"
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
index 9ff7b91ad9..dd1188b7c5 100644
--- a/conf/machine/include/omap3.inc
+++ b/conf/machine/include/omap3.inc
@@ -3,7 +3,7 @@ SOC_FAMILY = "omap3"
 require conf/machine/include/tune-cortexa8.inc
 PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r50"
+MACHINE_KERNEL_PR = "r51"
 
 KERNEL_IMAGETYPE = "uImage"
 
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/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"