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

13 files changed, 153 insertions, 23 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 75daba9f0d..de94be8477 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -1362,6 +1362,10 @@ sha256=0b654cd39126333a0dab7fdd2fd0c5023f6eb45e72d1d8bf9fb3cab175002bc7
 md5=0fc5008858661c0abd0399acbe30ef28
 sha256=26c833b0bdf3281c61e03f1fb985feced88cf4a5cebce7bd055f05e025460037
 
+[http://www.us.xfce.org/archive/xfce-4.6.1/src/Thunar-1.0.1.tar.bz2]
+md5=218373aa45d74b6ba8c69c4d5af3bb19
+sha256=7a2b6b493463756bbc9c54144fab2f2163bc84f0896b4c06fd225d11025a210d
+
 [http://www.us.xfce.org/archive/xfce/4.6.1/src/Thunar-1.0.1.tar.bz2]
 md5=218373aa45d74b6ba8c69c4d5af3bb19
 sha256=7a2b6b493463756bbc9c54144fab2f2163bc84f0896b4c06fd225d11025a210d
@@ -2642,6 +2646,10 @@ sha256=f34f8eabb463815adbf18d78883e2e61c5ad0020e087152a4c7a604fcd5754ea
 md5=2ad6ebb3f058e5fbe9ec5e0f0017db28
 sha256=06d9807c4135a468a5def531585ead9ea0948b206794e848efe234aa02df39d5
 
+[http://pawsa.fedorapeople.org/balsa/balsa-2.4.2.tar.bz2]
+md5=1eb90a92c089e194a595072a57c57394
+sha256=48bde6ff926fcc5d47853b87242cc890bdb21b5c74a2454a2b5c0269e9340090
+
 [ftp://ftp.debian.org/debian/pool/main/b/base-passwd/base-passwd_3.5.19.tar.gz]
 md5=5afcef5d6047f14cd5f65d2fdbd86fb2
 sha256=43debdc36c9aed8a2ef366bf3e98c1440e643a5ae9e7e1423b6309ddee5ae25e
@@ -5814,6 +5822,10 @@ sha256=1954a7e96d7fe70611c483836ed143e84a069eed6d3dab22c05a531bfb6da9e4
 md5=5cb7987d29db068153bdc8f23c767c43
 sha256=2b33f7c7658fb8f004c3aaf2717711262baeb5d77cf3fd24e9b6cc263895122d
 
+[http://xorg.freedesktop.org/releases/individual/proto/dri2proto-2.2.tar.bz2]
+md5=3ca8ddb42cd4ee31b8690031303221af
+sha256=f352950ffee4437d9da3e216d9a348ba0c7cf80c8c0fb30385c77ce3b780b2a1
+
 [http://www.ex-parrot.com/~chris/driftnet/driftnet-0.1.6.tar.gz]
 md5=8e11d77770452f97bb3c23f510489815
 sha256=dbdf7ead3ae14b109f88c86dedeb7524be8c257aa773a781891216f013373d6d
@@ -9314,6 +9326,10 @@ sha256=9d9ef356cc4478499442573556787125dc76c8acd1e55e5001fb11f1e224d27f
 md5=c9f8cebfba72bfab674bc0170551fb8d
 sha256=7fb83a28ae24d4f56eca88bc48f0fe414faee1afb2574bfb6257b52e8c716fcf
 
+[http://xorg.freedesktop.org/releases/individual/proto/glproto-1.4.11.tar.bz2]
+md5=78e7c4dc7dcb74b1869fee7897e00f59
+sha256=fe481d89d74f01db4f3a671ef1f29df29da74dff5b678517ee659a6f9d819451
+
 [http://xorg.freedesktop.org/releases/individual/proto/glproto-1.4.8.tar.bz2]
 md5=3dfbd17203c0c88b94b6f579f24c11cc
 sha256=2f5d84413853b688b7bb46c66fee108a499190e1f7810afffb775910778f053c
@@ -13930,6 +13946,10 @@ sha256=e4863cdf5d471763806e9bcae25ea47606a56cd91a5546a34c093aa3de181051
 md5=001d780829f936e34851ef7cd37b4dfd
 sha256=4def4d5c9fce85d690f1f29d675154594acdea3d3fe792d0cb513732c7b4bcb2
 
+[http://xorg.freedesktop.org/releases/individual/lib/libX11-1.3.3.tar.bz2]
+md5=5d74971360f194ce33d2bd2e4d9b066c
+sha256=8c7f867918a3739dc7cabe955179539d4a7ecc52cb42becfd261e5dfbff511ac
+
 [http://xorg.freedesktop.org/releases/individual/lib/libX11-1.3.tar.bz2]
 md5=0545089013213e90aac19b8f8045d32e
 sha256=34656d022ff2f94430b534612821428fe15ade028d86a42907958167f2e497ac
@@ -14922,6 +14942,10 @@ sha256=ddfd398383729707846e1f1689e9acb3bc672e4f255a632c8f0d0c55ddf8718c
 md5=e0e66fae165d0b665b61e9516bf33ade
 sha256=5e07ec4b644f50160900d4281a74dd1cbf1535cfe4ab24e0c28ae5b038836a8c
 
+[http://dri.freedesktop.org/libdrm/libdrm-2.4.17.tar.bz2]
+md5=667d81f993f7fd8a1b1b1b830a28a748
+sha256=b8a4e7c610b0e970546d791c06e28882857a49d34698633a89292d7ae142316a
+
 [http://www.metzlerbros.org/dvb/libdvb-0.5.5.1.tar.gz]
 md5=47612d2f8a4d4dee746a166d8b7f6f77
 sha256=941e8020129111377652bd7253ea85e6c133fd1c23c66bd9fc0ca9eabab1385a
@@ -15202,6 +15226,10 @@ sha256=7562042a6210947363bd6a9bbcdd03f8d02470c0347970b507f689d25a907844
 md5=06b14f1cd96432b0717ed03fe013ca4d
 sha256=55c616b0761faaa9fb028434de97b02d5145dfc52b1db632671ebc6cc6905575
 
+[http://ftp.gnome.org/pub/GNOME/sources/libgdata/0.5/libgdata-0.5.1.tar.bz2]
+md5=fc9be11d2f823bb16d6e03e2a0dda85d
+sha256=2b90f206063405ae6cf579ed3a090b0130e849e1ead02b2ad2ed4fc6d7f585a0
+
 [http://geda.seul.org/release/v1.4/1.4.1/libgeda-1.4.1.tar.gz]
 md5=16f2e3176eb489838bad57c8728c7388
 sha256=c0598428fc25e79b7ac1da35d44133e3fc50763b32fcdfffd5e6654f2f94682d
@@ -17746,6 +17774,10 @@ sha256=9dbd0f6c92b33ae8b96c5a045a341a00b2454492c2229839d056e4fd1488bca5
 md5=5d86ca7bb4ed458743acd922ff09dae6
 sha256=e4b6ab08eaff2766c3bf85ea8d63ab31ae774266b8351772117fcc94d1318ade
 
+[http://palm.cdnetworks.net/opensource/1.3.1/linuxkernel-2.6.24-patch.gz]
+md5=651e9c518db317d11ae5b9076fb0e3ee
+sha256=f9c0327a9fa379f2db6bf4b599bd1e37b65e7224aa3fd2bd860a5e0dc5b06040
+
 [http://linuxtv.org/downloads/linuxtv-dvb-apps-1.1.1.tar.bz2]
 md5=de958cdb8d00e74792dd69f3c945b037
 sha256=371f8133db705bde6c2f79cccb0b1a1f626a0d94bf41acceba5d76a69155f057
@@ -21974,6 +22006,10 @@ sha256=acbadfd4d725e628ab8906f87438b26ebf86e67d219bbdcf07a9ccd18bdaafd6
 md5=6e1dc8b9dd6983a54ff3a6de33efa778
 sha256=fa907ace507708e4a4bae32cc81a6271fb6da8bc0458fd8fc97cc4429ec8be11
 
+[http://downloads.sourceforge.net/pidgin/pidgin-2.6.5.tar.bz2]
+md5=90847ed22ec830db5d9768748812b661
+sha256=3c459e4093fca679591e35ea34da4a0e45b15f2bb7ca00314a1486dc022f3d0e
+
 [ftp://ftp.cac.washington.edu/pine/pine4.64.tar.Z]
 md5=75af127948cc0c701d424d22d621f792
 sha256=62c7b97695cb486e420afbbbe21bef853dd68a71665d867ffef50cb34dfba5f4
@@ -22034,6 +22070,10 @@ sha256=3438437c131c9847b34106225a728c11e522776ac454bb8740a9bc7aea409f22
 md5=02bd3669f53c404c19980d5efb6f86fb
 sha256=05f78c2fd3a5f054c0d716e8ba1b67a0c04a7a7e642d6946828ec383b389d185
 
+[http://cairographics.org/releases/pixman-0.17.4.tar.gz]
+md5=734f70667d0a6454a1b1e332f8d50083
+sha256=dd2f4a7c9c9373d20720d78718c0e9603741a83d66da3316a020b097b1c918a9
+
 [http://xorg.freedesktop.org/releases/individual/lib/pixman-0.9.4.tar.bz2]
 md5=c354ab5b0da10227226d3ef604254875
 sha256=261d239e9e3070a0a81e5b3eab92e6236c6295979bdae0a1ded05cbef93f67aa
@@ -24234,6 +24274,10 @@ sha256=91619748c4dba733c60eb8a40805c972f407b2463dc6de856ac40336d66bc16c
 md5=5b60500bc9605d2409b71124e48aa929
 sha256=59cc003bab753335b3ce14a908e663ea782514b3531dc7030379ff753ef1a78c
 
+[http://cloud.github.com/downloads/kichkasch/rtmom/rtmom-src-0.1.3.tar.gz]
+md5=c4a1012fc0e00d2b64d8d794166bf893
+sha256=9227e503a90054dd643364272d48b3eae8dae3a9c6c4a42a2859395a8786398f
+
 [http://libtorrent.rakshasa.no/downloads/rtorrent-0.8.0.tar.gz]
 md5=6216be7ce5e3ead9dc115eaeea863694
 sha256=597cefac4535d7f3b752253e5997b3c851c261b26b966a39beb032dcf1d5baa7
@@ -27370,6 +27414,10 @@ sha256=57d2629849796b4dc919261eadd1eea3ee6e634d58979797287f7e09408cde67
 md5=8ac38951e753f250aaefbd4ba0afda94
 sha256=d49ab68cad724ae51f6cb69f7f5cfff7629cbb066f4c5c8bda81d62675a21986
 
+[http://xorg.freedesktop.org/releases/individual/util/util-macros-1.5.0.tar.gz]
+md5=ffef78135535c60c2b68d0a2a4ecae9b
+sha256=d47116ce5df198859a6082af7a72505575d1685b8c82bb4ef6fbedfa3316617e
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/util/util-macros-X11R7.0-1.0.1.tar.bz2]
 md5=bc6be634532d4936eb753de54e1663d3
 sha256=e95a45db65b33be472a3134492e348c4cd6edc200d02a85654ffe62bc2e6fdcd
@@ -28206,6 +28254,10 @@ sha256=9b4096bb1e273914adf101182c27d457f46fcc44d1b3ea027bae3d34ace8c6f7
 md5=3ad40ea2b1728eefa94f60beb9951ff7
 sha256=9b4096bb1e273914adf101182c27d457f46fcc44d1b3ea027bae3d34ace8c6f7
 
+[http://downloads.sourceforge.net/wxwindows/wxWidgets-2.9.0.tar.bz2]
+md5=09058928eeb72853142c062bdec056ce
+sha256=8cf5c1dcf6357b2d27efd0c737b95baf1d2d1e88b5bf24560824b5eb6f2dc782
+
 [http://xorg.freedesktop.org/releases/individual/app/x11perf-1.4.1.tar.bz2]
 md5=fd06c8b8e3572a0e14af65a49e0dd7d1
 sha256=c81819618ec596fda55b950ef80f2ee02e5ce149ea99f1f741cedb459b4d3064
@@ -29674,6 +29726,10 @@ sha256=738463dbf1980b9d0f95936a2d951dc51bd776c7949215c2456580948660669e
 md5=4d76953e97ee760efb7627e7ac721dbf
 sha256=ea2b875a8bb8ab9d987192dbcb4fb595e511b382d06260baf23a936f7e61fa14
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-2.10.0.tar.bz2]
+md5=78309d4f04dd8ae6585d120377042741
+sha256=e46dd691dc93db7cd6f5f22b84fea7e9f4bfd34f28026cfd680993b3ccfc48ab
+
 [http://xorg.freedesktop.org/releases/individual/driver/xf86-video-intel-2.2.1.tar.bz2]
 md5=3334dc5142871b78fc609fd1b3dac3f2
 sha256=d976c5f5e9c84f3817aba6ad22855446f1c2b9bfa0d53bd11c37c62cfdefa60a
@@ -30234,6 +30290,10 @@ sha256=8b3e077d2534722033d7b1c647aa7f31fc7fbb5014da096b7a53170005e80226
 md5=61a1dc9a22991bd04d0ff98f800775c1
 sha256=a3657971232e9c7db3e7517a8aedd86d3ef4d159f7099ec974cdd03aafa41080
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vesa-2.3.0.tar.bz2]
+md5=07fa32958aff9b463dd3af5481ef6626
+sha256=8ed85a0e94523539d81d5ae6639fa22ceb1c1e3baf89128915db65d4d2900d7a
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-vesa-X11R7.0-1.0.1.3.tar.bz2]
 md5=049ada4df1abb5aa2b6633ba90353e78
 sha256=c6601cd278ebc30a0d20b49b6284bc21b4910f8ef5d24d1c62daa1591a251452
@@ -30286,6 +30346,10 @@ sha256=3e4e9abfd806b36076083ef6cacc93b713bfa4ddefe7005edfc15c64f5174366
 md5=25287a202c986b33bd79fbe379c96a16
 sha256=956443948d94f7459b0056d8cb8ff2cd9fba4621d8b61f0257cb84469ea7da07
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-video-vmware-10.16.9.tar.bz2]
+md5=3b3d38abfa1f8be4b1e26dcd236bc94f
+sha256=835a5e45b54837cbbd963a48bd09db709717e097e931dd76e68e397a167e8bc1
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-video-vmware-X11R7.0-10.11.1.3.tar.bz2]
 md5=4df79349e26add4c23f6be8bec347ad4
 sha256=79b0bf59d866d3760fa8a55b4a19d56ae7fa6a962d629a9de5c188cec5c98c9a
@@ -30510,6 +30574,10 @@ sha256=5eab9a3ba822a1163c07efd917c3425eaf149c01c09df375ac38a0cb7ddf20a4
 md5=7d09d161efc7ef86b3b48791d98c8ae8
 sha256=1e7a506f08c8a4f368dd18648006ba3934a94eb96fd4545f5303d46aeae9cc3e
 
+[http://www.us.xfce.org/archive/xfce-4.6.0/src/xfce4-dev-tools-4.6.0.tar.bz2]
+md5=c9587fa78e877eee858a33391d0afd62
+sha256=4763a891ac7030c109c7ca03b1b0b834859c2aac4f8e359774ee01a6875694ac
+
 [http://www.us.xfce.org/archive/xfce/4.6.0/src/xfce4-dev-tools-4.6.0.tar.bz2]
 md5=c9587fa78e877eee858a33391d0afd62
 sha256=4763a891ac7030c109c7ca03b1b0b834859c2aac4f8e359774ee01a6875694ac
@@ -31342,6 +31410,10 @@ sha256=f4fb49209a6f3cb1c5b039b1f43870774e2eac1540b4d3235a2f13bc441da159
 md5=4c63b22cad9ed8ae8b86561f0f92c327
 sha256=4b644113cd030fc77615c03c7b6529e063dc1d471ec6a990e6f62eb45a9c2db4
 
+[http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.7.4.tar.bz2]
+md5=75d27c3a1c12293f620a2d6518fcbdfa
+sha256=b8ec11b3f2c6f84c21e8cd9804672ba6e27fda3e913d58dd947205ea253e33f8
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/xserver/xorg-server-X11R7.0-1.0.1.tar.bz2]
 md5=0e7527480fb845a3c2e333bd0f47ff50
 sha256=0419124e1bab473f8f9e2d7de1dba8bae2ed1375b72d55cdfb9471dac357ed47
@@ -31894,6 +31966,10 @@ sha256=487bf07b2f9ead6a59682d091081e47cfe4ca5777de32e6cec5bef55fa51c82f
 md5=e0744594f4e5969b20df28d897781318
 sha256=6d0feb42c2f1d6011d97c776b9d580fd589cdf3cfe246cd99437c406a2740d36
 
+[http://xorg.freedesktop.org/releases/individual/app/xvidtune-1.0.2.tar.bz2]
+md5=e40eeb4454f2a7cdde3a14f5dfd3aadd
+sha256=73ca41bd5e73560663bea0d98149b099cfef5743a2282ca67547e97732618a53
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/app/xvidtune-X11R7.0-1.0.1.tar.bz2]
 md5=a12e27fb732cb115b6adc4c724c44c5d
 sha256=f7b3925d7e9981d146d3e5774de0521e6d48e2ed99841f538f267e8bc58bf5cd
diff --git a/conf/distro/include/kaeilos-2009-preferred-versions.inc b/conf/distro/include/kaeilos-2009-preferred-versions.inc
index 8b120f2eb2..870ac04036 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: 11-01-2010
+#@VERSION: 20-01-2010
 #
 # KaeilOS is a registered trade mark of KOAN - Bergamo - Italia
 # Product website : http://www.KaeilOS.com 
@@ -46,6 +46,9 @@ PREFERRED_VERSION_python = "2.6.2"
 PREFERRED_VERSION_samba		= "3.3.9"
 PREFERRED_VERSION_tiff 		= "3.8.2+4.0.0beta2"
 
+KAEILOS_WX_VERSION ?= "2.8.10"
+PREFERRED_VERSION_wxwidgets = "${KAEILOS_WX_VERSION}"
+
 KAEILOS_QT_VERSION ?= "4.6.0"
 PREFERRED_VERSION_qt4-tools-native = "${KAEILOS_QT_VERSION}"
 PREFERRED_VERSION_qt4-tools-sdk = "${KAEILOS_QT_VERSION}"
diff --git a/conf/distro/include/preferred-xorg-versions-live.inc b/conf/distro/include/preferred-xorg-versions-live.inc
index bea2b4105c..65e94fac5c 100644
--- a/conf/distro/include/preferred-xorg-versions-live.inc
+++ b/conf/distro/include/preferred-xorg-versions-live.inc
@@ -1,4 +1,4 @@
-#Thu Dec 31 14:54:51 CET 2009
+#Mon Jan 18 14:00:56 CET 2010
 #app
 PREFERRED_VERSION_appres ?= "1.0.2"
 PREFERRED_VERSION_bdftopcf ?= "1.0.2"
@@ -98,7 +98,7 @@ PREFERRED_VERSION_xsetroot ?= "1.0.3"
 PREFERRED_VERSION_xsm ?= "1.0.1"
 PREFERRED_VERSION_xstdcmap ?= "1.0.1"
 PREFERRED_VERSION_xtrap ?= "1.0.2"
-PREFERRED_VERSION_xvidtune ?= "1.0.1"
+PREFERRED_VERSION_xvidtune ?= "1.0.2"
 PREFERRED_VERSION_xvinfo ?= "1.1.0"
 PREFERRED_VERSION_xwd ?= "1.0.3"
 PREFERRED_VERSION_xwininfo ?= "1.0.5"
@@ -156,8 +156,7 @@ PREFERRED_VERSION_xf86-video-i740 ?= "1.3.2"
 PREFERRED_VERSION_xf86-video-i810 ?= "1.7.4"
 PREFERRED_VERSION_xf86-video-impact ?= "0.2.0"
 PREFERRED_VERSION_xf86-video-imstt ?= "1.1.0"
-#PREFERRED_VERSION_xf86-video-intel ?= "2.9.99.902"
-PREFERRED_VERSION_xf86-video-intel ?= "2.9.1"
+PREFERRED_VERSION_xf86-video-intel ?= "2.10.0"
 PREFERRED_VERSION_xf86-video-mach64 ?= "6.8.2"
 PREFERRED_VERSION_xf86-video-mga ?= "1.9.100"
 PREFERRED_VERSION_xf86-video-neomagic ?= "1.2.4"
@@ -187,11 +186,10 @@ PREFERRED_VERSION_xf86-video-trident ?= "1.3.3"
 PREFERRED_VERSION_xf86-video-tseng ?= "1.2.3"
 PREFERRED_VERSION_xf86-video-v4l ?= "0.2.0"
 PREFERRED_VERSION_xf86-video-vermilion ?= "1.0.1"
-PREFERRED_VERSION_xf86-video-vesa ?= "2.2.1"
+PREFERRED_VERSION_xf86-video-vesa ?= "2.3.0"
 PREFERRED_VERSION_xf86-video-vga ?= "4.1.0"
 PREFERRED_VERSION_xf86-video-via ?= "0.2.2"
-#PREFERRED_VERSION_xf86-video-vmware ?= "10.16.9"
-PREFERRED_VERSION_xf86-video-vmware ?= "10.16.8"
+PREFERRED_VERSION_xf86-video-vmware ?= "10.16.9"
 PREFERRED_VERSION_xf86-video-voodoo ?= "1.2.3"
 PREFERRED_VERSION_xf86-video-wsfb ?= "0.3.0"
 PREFERRED_VERSION_xf86-video-xgi ?= "1.5.1"
@@ -244,8 +242,8 @@ PREFERRED_VERSION_libice-native ?= "1.0.6"
 PREFERRED_VERSION_libsm ?= "1.1.1"
 PREFERRED_VERSION_libsm-native ?= "1.1.1"
 PREFERRED_VERSION_libwindowswm ?= "1.0.1"
-PREFERRED_VERSION_libx11 ?= "1.3.2"
-PREFERRED_VERSION_libx11-native ?= "1.3.2"
+PREFERRED_VERSION_libx11 ?= "1.3.3"
+PREFERRED_VERSION_libx11-native ?= "1.3.3"
 PREFERRED_VERSION_libxscrnsaver ?= "1.2.0"
 PREFERRED_VERSION_libxtrap ?= "1.0.0"
 PREFERRED_VERSION_libxau ?= "1.0.5"
@@ -294,8 +292,7 @@ PREFERRED_VERSION_libpciaccess ?= "0.11.0"
 PREFERRED_VERSION_libxkbfile ?= "1.0.6"
 PREFERRED_VERSION_libxkbfile-native ?= "1.0.6"
 PREFERRED_VERSION_libxkbui ?= "1.0.2"
-#PREFERRED_VERSION_pixman ?= "0.17.2"
-PREFERRED_VERSION_pixman ?= "0.16.2"
+PREFERRED_VERSION_pixman ?= "0.17.4"
 PREFERRED_VERSION_xtrans ?= "1.2.5"
 PREFERRED_VERSION_xtrans-native ?= "1.2.5"
 #proto
@@ -305,7 +302,7 @@ PREFERRED_VERSION_bigreqsproto-native ?= "1.1.0"
 PREFERRED_VERSION_compositeproto ?= "0.4.1"
 PREFERRED_VERSION_damageproto ?= "1.2.0"
 PREFERRED_VERSION_dmxproto ?= "2.3"
-PREFERRED_VERSION_dri2proto ?= "2.1"
+PREFERRED_VERSION_dri2proto ?= "2.2"
 PREFERRED_VERSION_evieext ?= "1.1.0"
 PREFERRED_VERSION_fixesproto ?= "4.1.1"
 PREFERRED_VERSION_fixesproto-native ?= "4.1.1"
@@ -313,7 +310,7 @@ PREFERRED_VERSION_fontcacheproto ?= "0.1.3"
 PREFERRED_VERSION_fontcacheproto-native ?= "0.1.3"
 PREFERRED_VERSION_fontsproto ?= "2.1.0"
 PREFERRED_VERSION_fontsproto-native ?= "2.1.0"
-PREFERRED_VERSION_glproto ?= "1.4.10"
+PREFERRED_VERSION_glproto ?= "1.4.11"
 PREFERRED_VERSION_inputproto ?= "2.0"
 PREFERRED_VERSION_inputproto-native ?= "2.0"
 PREFERRED_VERSION_kbproto ?= "1.0.4"
@@ -349,9 +346,9 @@ PREFERRED_VERSION_imake ?= "1.0.2"
 PREFERRED_VERSION_lndir ?= "1.0.1"
 PREFERRED_VERSION_makedepend ?= "1.0.2"
 PREFERRED_VERSION_makedepend-native ?= "1.0.2"
-PREFERRED_VERSION_util-macros ?= "1.4.1"
-PREFERRED_VERSION_util-macros-native ?= "1.4.1"
+PREFERRED_VERSION_util-macros ?= "1.5.0"
+PREFERRED_VERSION_util-macros-native ?= "1.5.0"
 PREFERRED_VERSION_xorg-cf-files ?= "1.0.3"
 #xserver
 #PREFERRED_VERSION_xserver-xorg ?= "1.7.99.2"
-PREFERRED_VERSION_xserver-xorg ?= "1.7.3"
+PREFERRED_VERSION_xserver-xorg ?= "1.7.4"
diff --git a/conf/distro/include/sane-feed.inc b/conf/distro/include/sane-feed.inc
index 5bc19a1806..873972f5aa 100644
--- a/conf/distro/include/sane-feed.inc
+++ b/conf/distro/include/sane-feed.inc
@@ -41,7 +41,13 @@ FEED_ARCH_a780 		= "armv5te"
 FEED_ARCH_akita 	= "armv5te"
 FEED_ARCH_asus620 	= "armv5te"
 FEED_ARCH_asus730 	= "armv5te"
+FEED_ARCH_at91sam9260ek = "armv5te"
+FEED_ARCH_at91sam9261ek = "armv5te"
 FEED_ARCH_at91sam9263ek = "armv5te"
+FEED_ARCH_at91sam9rlek 	= "armv5te"
+FEED_ARCH_at91sam9g10ek = "armv5te"
+FEED_ARCH_at91sam9g20ek = "armv5te"
+FEED_ARCH_at91sam9g45ekes = "armv5te"
 FEED_ARCH_aximx50 	= "armv5te"
 FEED_ARCH_aximx50v 	= "armv5te"
 FEED_ARCH_c7x0 		= "armv5te"
diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc
index 733b15e78b..06e3f1c8e0 100644
--- a/conf/distro/include/sane-srcrevs-fso.inc
+++ b/conf/distro/include/sane-srcrevs-fso.inc
@@ -16,6 +16,7 @@ SRCREV_pn-libfsobasics ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-libfsoframework ?= "c227502c59f4d1de3b3097b3329c2461d6cfa2a2"
 SRCREV_pn-libfsotransport ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-libfsoresource ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-mickeydbus2 ?= "${FSO_CORNUCOPIA_SRCREV}"
 
 # FSO Projects -- Misc
 SRCREV_pn-dbus-hlid ?= "5df7f49fe8881804aaab544a569fd164c3e93afb"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 207c320a66..f4d79268a2 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -148,7 +148,7 @@ SRCREV_pn-linux-ixp4xx ?= "1089"
 SRCREV_pn-linux-openmoko-2.6.24 ?= "fb42ce6724576fc173faf8abfb04aa2c36d213b7"
 SRCREV_pn-linux-openmoko-2.6.28 ?= "8c65792a5c83c76d662a617a7c4e1ae8104bb6a5"
 SRCREV_pn-linux-openmoko-2.6.31 ?= "dd32737aa524e09c1d141a0e735dd58674552244"
-SRCREV_pn-linux-openmoko-2.6.32 ?= "5827b20d022fb47ce9c9731d0fb894d361e16ffe"
+SRCREV_pn-linux-openmoko-2.6.32 ?= "058cbf4220fd2f1cd970bf553c044cb178e3804e"
 SRCREV_pn-linux-openmoko-devel ?= "a15608f241a40b41fed5bffe511355c2067c4e88"
 SRCREV_pn-linux-openmoko-shr-devel ?= "a15608f241a40b41fed5bffe511355c2067c4e88"
 SRCREV_pn-linux-openmoko-shr-drm-devel ?= "e62a4ae1c6783f41b41a9ac3d258786586b65a40"
@@ -312,6 +312,7 @@ SRCREV_pn-socketcan-modules ?= "917"
 SRCREV_pn-socketcan-utils-test ?= "917"
 SRCREV_pn-sphyrna-python ?= "45"
 SRCREV_pn-starling ?= "9574"
+SRCREV_pn-stopwatch ?= "89644b91e02151fc72989755f20c1ffb144ef5e2"
 SRCREV_pn-table ?= "2191"
 SRCREV_pn-tichy ?= "ab68d849502009cf3214df48ffa8075a10cc2177"
 SRCREV_pn-tmut ?= "60"
diff --git a/conf/distro/include/sane-toolchain.inc b/conf/distro/include/sane-toolchain.inc
index 04fde21b25..daa2deff29 100644
--- a/conf/distro/include/sane-toolchain.inc
+++ b/conf/distro/include/sane-toolchain.inc
@@ -9,8 +9,8 @@ PREFERRED_GCC_VERSION                ?= "4.4.2"
 PREFERRED_BINUTILS                   ?= "2.20"
 
 # Prefer glibc 2.6 and uclibc 0.9.30, these have had the most testing.
-PREFERRED_VERSION_glibc             ?= "2.6.1"
-PREFERRED_VERSION_glibc-initial     ?= "2.6.1"
+PREFERRED_VERSION_glibc             ?= "2.10.1"
+PREFERRED_VERSION_glibc-initial     ?= "2.10.1"
 PREFERRED_VERSION_eglibc             ?= "2.10"
 PREFERRED_VERSION_eglibc-initial     ?= "2.10"
 PREFERRED_VERSION_uclibc            ?= "0.9.30.1"
diff --git a/conf/distro/micro.conf b/conf/distro/micro.conf
index d9fc595303..9885425979 100644
--- a/conf/distro/micro.conf
+++ b/conf/distro/micro.conf
@@ -62,6 +62,8 @@ MACHINE_KERNEL_VERSION = "2.6"
 #############################################################################
 LIBC ?= "eglibc"
 PREFERRED_BINUTILS = "2.19.51"
+PREFERRED_VERSION_glibc             ?= "2.10.1"
+PREFERRED_VERSION_glibc-initial     ?= "2.10.1"
 PREFERRED_ARM_INSTRUCTION_SET ?= "thumb"
 require conf/distro/include/sane-toolchain.inc
 
diff --git a/conf/machine/at91sam9260ek.conf b/conf/machine/at91sam9260ek.conf
index 9a7ca9af62..3fdfce4ba1 100644
--- a/conf/machine/at91sam9260ek.conf
+++ b/conf/machine/at91sam9260ek.conf
@@ -7,7 +7,6 @@ TARGET_ARCH = "arm"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 PREFERRED_VERSION_linux = "2.6.28"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
 KERNEL_IMAGETYPE = "uImage"
 UBOOT_MACHINE = "at91sam9260ek_config"
diff --git a/conf/machine/at91sam9g10ek.conf b/conf/machine/at91sam9g10ek.conf
new file mode 100644
index 0000000000..9f41fd9b11
--- /dev/null
+++ b/conf/machine/at91sam9g10ek.conf
@@ -0,0 +1,23 @@
+#@TYPE: Machine
+#@Name: Atmel AT91SAM9G10EK Development Platform
+#@DESCRIPTION: Machine configuration for the at91sam9g10ek development board with a at91sam9g10 processor
+
+TARGET_ARCH = "arm"
+#PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+
+KERNEL_IMAGETYPE = "uImage"
+
+#don't try to access tty1
+USE_VT = "0"
+
+MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget screen touchscreen"
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "115200 ttyS0"
+IMAGE_FSTYPES ?= "jffs2"
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
+
+require conf/machine/include/tune-arm926ejs.inc
diff --git a/conf/machine/at91sam9g20ek.conf b/conf/machine/at91sam9g20ek.conf
index 7dc6ba0d53..59c5a42c64 100644
--- a/conf/machine/at91sam9g20ek.conf
+++ b/conf/machine/at91sam9g20ek.conf
@@ -6,7 +6,6 @@ TARGET_ARCH = "arm"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux"
 PREFERRED_VERSION_linux = "2.6.28"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
 KERNEL_IMAGETYPE = "uImage"
 UBOOT_MACHINE = "at91sam9g20ek_config"
diff --git a/conf/machine/at91sam9g45ekes.conf b/conf/machine/at91sam9g45ekes.conf
new file mode 100644
index 0000000000..2d962ef276
--- /dev/null
+++ b/conf/machine/at91sam9g45ekes.conf
@@ -0,0 +1,23 @@
+#@TYPE: Machine
+#@Name: Atmel AT91SAM9G45EKES Development Platform
+#@DESCRIPTION: Machine configuration for the at91sam9g45ekes development board with a at91sam9g45-es processor
+
+TARGET_ARCH = "arm"
+#PACKAGE_EXTRA_ARCHS = "armv4t armv5te"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+
+KERNEL_IMAGETYPE = "uImage"
+
+#don't try to access tty1
+USE_VT = "0"
+
+MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget screen touchscreen"
+
+# used by sysvinit_2
+SERIAL_CONSOLE = "115200 ttyS0"
+IMAGE_FSTYPES ?= "jffs2"
+EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x20000 -n"
+
+require conf/machine/include/tune-arm926ejs.inc
diff --git a/conf/machine/at91sam9rlek.conf b/conf/machine/at91sam9rlek.conf
index f7a78dcf75..de26926650 100644
--- a/conf/machine/at91sam9rlek.conf
+++ b/conf/machine/at91sam9rlek.conf
@@ -17,7 +17,7 @@ PREFERRED_VERSION_at91bootstrap = "2.10"
 #don't try to access tty1
 USE_VT = "0"
 
-MACHINE_FEATURES = "kernel26 alsa ext2 usbhost usbgadget screen touchscreen"
+MACHINE_FEATURES = "kernel26 alsa ext2 usbgadget screen touchscreen"
 EXTRA_IMAGEDEPENDS += "u-boot"
 #EXTRA_IMAGEDEPENDS += "at91bootstrap"