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

30 files changed, 437 insertions, 135 deletions

diff --git a/conf/amend-recipes.inc b/conf/amend-recipes.inc
deleted file mode 100644
index bcb93d4e75..0000000000
--- a/conf/amend-recipes.inc
+++ /dev/null
@@ -1,29 +0,0 @@
-# Allows tweaks to be amended to a recipe via a .inc in its FILESPATH
-#
-# Simply drop amend.inc into an appropriate place in a recipe's FILESPATH and
-# it'll be parsed in after the recipe itself is.
-#
-# Copyright (c) 2009 MontaVista Software, Inc.  All rights reserved.
-#
-# Released under the MIT license (see LICENSE.MIT for the terms)
-
-python () {
-    import bb, os
-
-    filespath = d.getVar("FILESPATH", 1).split(":")
-    amendfiles = [os.path.join(fpath, "amend.inc")
-                  for fpath in filespath]
-
-    # Adding all amend.incs that can exist to the __depends, to ensure that
-    # creating one of them invalidates the bitbake cache.  Note that it
-    # requires a fix in bitbake.  Without the bitbake fix, the cache will be
-    # completely invalidated on every bitbake execution.
-    depends = d.getVar("__depends", 0) or []
-    d.setVar("__depends", depends + [(file, 0) for file in amendfiles if not os.path.exists(file)])
-
-    existing = (file for file in amendfiles if os.path.exists(file))
-    try:
-        bb.parse.handle(existing.next(), d, 1)
-    except StopIteration:
-        pass
-}
diff --git a/conf/checksums.ini b/conf/checksums.ini
index ea05753c73..a82b7b36eb 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -1166,10 +1166,6 @@ sha256=89f94840b1b42ddfe53a8aee415331516f1bbdd942b42d25e74906a332cdf22a
 md5=0b5b91015d0f3bd9597e094ba67c4d65
 sha256=a8222a274778ff16d0e3ee49a30db27a48a4d357169a915fc599a764e405e0b6
 
-[http://www.libsdl.org/projects/SDL_mixer/release/SDL_mixer-1.2.9.tar.gz]
-md5=a9eb8750e920829ff41dbe7555850156
-sha256=557910a4a3aeed6d10238e26b5a39b19247115a1b352580082bb15dc02ae4b8d
-
 [http://www.libsdl.org/projects/SDL_net/release/SDL_net-1.2.5.tar.gz]
 md5=e45b1048d2747480dcc65ece4130a920
 sha256=397dee6b7ac13dea70dd3dd2ae6044f45a632a1ba156da178c96df66fb8ccdcb
@@ -2646,6 +2642,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
@@ -4358,6 +4358,10 @@ sha256=5c7f2bf864b34d4bb17d7d046eca4f07f8174ce4ca3a73339b956fedd95c9752
 md5=27d9b5c12f7d3a1877aeb34f2048e7fa
 sha256=5c7f2bf864b34d4bb17d7d046eca4f07f8174ce4ca3a73339b956fedd95c9752
 
+[http://downloads.sourceforge.net/clish/clish-0.7.3.tar.gz]
+md5=81e20f7a888bcd8e2280e37804d342e4
+sha256=c8c2416848950ac452cd4010311554d7f232f81abd543fe9ba2d7146dbb6c96f
+
 [http://my-zaurus.narod.ru/downloads/clockapplet.tar.gz]
 md5=7265673901eacb0b72a11cd6732cc698
 sha256=80fd209d065887729fdeb81f5a91638626e7ed31dabab40c446bd12042df9057
@@ -7278,6 +7282,10 @@ sha256=84cabad81bb78fc08ae3d8abae57840cf575a0ca6ca719c7d9bed19505d06ea3
 md5=e0be927617be4ffc1ddc79513f4eb0f9
 sha256=7306ee55a8e95a4d07bee339ffb3be2d88ef8cc08b86edd6c63d7b28f559ec88
 
+[http://mirrors.igsobe.com/nongnu/flvstreamer/source/flvstreamer-2.1a.tar.gz]
+md5=7b1d1a3ab3cd0d93edd69e7b50ce6aca
+sha256=5df6649dfcfd6c4d7259a99b6cb2f031491fc88ca9b2751632e4e78105f58df5
+
 [http://www.stanford.edu/~blp/fmtools/fmtools-1.0.2.tar.gz]
 md5=4bae0e5feeb8cbf4cfcb950301e9509d
 sha256=60a55ba4a57b5ed430c62662283e9cb6de685c8497173f1f2065f684b2aceabd
@@ -8762,6 +8770,10 @@ sha256=8e7dfa34f3919226550dc6507a23753f9fda55e78b15b264291ecf5940d837e9
 md5=90d4dba51dd75f8f1f12378e0f910d76
 sha256=7cd1b2266f5ae85a6d338c1c36ebe34e7c641ceb6a362e4526435c82d1e6fc5d
 
+[http://linuxcentre.net/get_iplayer/get_iplayer-2.64/get_iplayer]
+md5=77949602460e30ea1aec0ee6684b90e2
+sha256=63a4e394f38ae530c37e05e95806f358c6802d3159b868848a9604efdabc5ca0
+
 [ftp://ftp.gnu.org/gnu/gettext/gettext-0.14.1.tar.gz]
 md5=78f4b862510beb2e5d43223dd610e77d
 sha256=41f20c469c7759acb34cfa7e0b3cac9096d59a58ad800e471f07424a8e7adbb7
@@ -9602,10 +9614,26 @@ sha256=af2ebf32fe93817e06333b94d3fabcf72fa5675f402c1bbdb7bed3be0b3b3a3e
 md5=23bf4e795725a74ebb37daacda784adb
 sha256=3105dfb490c187adbe1c14582daa5a134ec672c396af3dd4e0e29cc9fbb4a6ea
 
+[http://ftp.gnome.org/pub/GNOME/sources/gnome-games/2.24/gnome-games-2.24.3.tar.bz2]
+md5=e416e2922fe119c41ec224fab97f7909
+sha256=6ad3c849ea10f47c76cbf9c34a5e413b2549c919c5c388be0c42c59bcf3a388d
+
 [http://ftp.gnome.org/pub/GNOME/sources/gnome-games/2.25/gnome-games-2.25.1.tar.bz2]
 md5=886ab09752d3b420b744865342f07eb0
 sha256=a29eca01be141a9208ef2be3dc497d05faf4d2c0ca3e3d9edeec611ca3388b28
 
+[http://ftp.gnome.org/pub/GNOME/sources/gnome-games/2.26/gnome-games-2.26.3.tar.bz2]
+md5=32c69a25671d8d23b19f234efcc177ca
+sha256=f29849507bd2a29a747b73f412fcbc8c74f3a9b5bf38d4b763b4242ac84cf46f
+
+[http://ftp.gnome.org/pub/GNOME/sources/gnome-games/2.27/gnome-games-2.27.92.tar.bz2]
+md5=306b7d85a9b7985fde570e672edb9e3c
+sha256=88522f18843c5dc7a91b45aaf01ab4ed8e9c79560e1ce1c413560d7343c889d6
+
+[http://ftp.gnome.org/pub/GNOME/sources/gnome-games/2.28/gnome-games-2.28.2.tar.bz2]
+md5=6dcd006d4393524c1e4f39ca0310ac8d
+sha256=7afca16831eff95cf3e9ea4f1344d26ed30b274b89b06403adf0757221b36899
+
 [http://ftp.gnome.org/pub/GNOME/sources/gnome-games/2.6/gnome-games-2.6.1.tar.bz2]
 md5=6ea145547bfd8aa828b22cbbe34cbedf
 sha256=d7a823601f569589437d671d12b1b12f53abc08aeb7d25280bb3242299353086
@@ -9814,6 +9842,10 @@ sha256=7ad66f99a1bad1ae0bbb02bd7a7cf8ed17fdc3fd104fa5c68e04961459ad5c50
 md5=fbcf4ef5ec4a8c4eec4d390c5889c80f
 sha256=400a5401a591e271c3357d0a8cb05a7927b4c218130497d06f75df9763d4efd8
 
+[http://ftp.gnome.org/pub/GNOME/sources/gnome-python-desktop/2.28/gnome-python-desktop-2.28.0.tar.bz2]
+md5=d97bb3d8e1adc00505be060fbc832f44
+sha256=92948d2dd0d03a56abe565f3c24725242251db261bd0a12aad5a742326cb3c7f
+
 [http://ftp.gnome.org/pub/GNOME/sources/gnome-python-extras/2.19/gnome-python-extras-2.19.1.tar.bz2]
 md5=08896c63d71ce44d20fafbaf9c0edc78
 sha256=c5f74f4c46dbb379d119d6f74ca4a47653af251bea176dc7a0ecacccb88339f0
@@ -11326,6 +11358,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
@@ -11542,6 +11578,10 @@ sha256=05fce9327dbe78a74ad4cd45383d541f96f19d40d3c03076cdf6908ad28ad241
 md5=369e173600efc272131b53b1902679e8
 sha256=1c0665fe560a560851e8b3c9a6501d416c4b54abfb6fa07549d703a04ea768bf
 
+[http://download.gnome.org/sources/gtk+/2.18/gtk+-2.18.6.tar.bz2]
+md5=3b32073cf1fad755f7c2b2db71aebe90
+sha256=5629944917b739152d89b69279aefcc3de9fe12a12fd7adb3ca39c840df9354d
+
 [http://handhelds.org/packages/gtk-2.0/gtk+-2.2.4.diff.bz2]
 md5=c6697665e06cad01e87c2cf8d0913725
 sha256=2a768a45adea587c4a7d6e3c3567ad7961bf7509e118ae62ce32f5369b1aeeb0
@@ -12070,6 +12110,10 @@ sha256=dd1c1bb297fc4bfdce73614322cb60d92d99db719e473b9cbb4c62e0ea444147
 md5=3534f7b8e59785c7d5bfa923e85510a7
 sha256=9d73af8f61240fbb3c522321582cd693c5b81ef344067a3949f0aa624610adee
 
+[http://icon-theme.freedesktop.org/releases/hicolor-icon-theme-0.11.tar.gz]
+md5=5cf5527e803a554f43319ee53c771e0b
+sha256=44eb1f158a9b2a92cd626541a24c44387162b3d792e4b238c84e6f3d8ed1dd9a
+
 [http://freedesktop.org/software/icon-theme/releases/hicolor-icon-theme-0.5.tar.gz]
 md5=947c7f6eb68fd95c7b86e87f853ceaa0
 sha256=8643ddab3b5afd2f94a2db771bae6710ec49d76a6c6890debaa711de8f3bf12e
@@ -12982,6 +13026,10 @@ sha256=3c6b48af9e655e4f0a34c7718e288960a1dc84a3ac7eb726e855adb45fbd953a
 md5=a3ecfaa091289656fae786b027b44eda
 sha256=ff7b78ebb112ebeb3901fe36823328c4af89040b890c25db43d8e35ccbc663b3
 
+[http://developer.osdl.org/dev/iproute2/download/iproute2-2.6.31.tar.bz2]
+md5=230f35282a95451622f3e8394f9cd80a
+sha256=56875eaed9c581645422d89e00fa7da512256c82ac3dae3c5051ff6827e83152
+
 [http://downloads.sourceforge.net/ipsec-tools/ipsec-tools-0.5-rc1.tar.bz2]
 md5=74fc66f01937076f65079e194dd2b0d0
 sha256=325bfc9607ccf56e7de0e7973e18fac76678e50b8cf24d3818b4feb734a0e45d
@@ -13474,6 +13522,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
@@ -16454,6 +16506,10 @@ sha256=a6197352ad5b79a9a1ce0dd59f5e737cfbf909e0f3c5f64631cf0d93549e4e40
 md5=2faa7f8d81e6a35beb991cb75edbf056
 sha256=a172c5afe4668a31eb090d14be7fc2811a9fec8568a785badd30280f47a27e00
 
+[http://downloads.sourceforge.net/libpng/libpng-1.2.42.tar.bz2]
+md5=9a5cbe9798927fdf528f3186a8840ebe
+sha256=a044c4632a236bbf99527da81977577929a173c1f7f68a70a81ea2ea7cffa6a7
+
 [http://downloads.sourceforge.net/libpng/libpng-1.2.8.tar.bz2]
 md5=00cea4539bea4bd34cbf8b82ff9589cd
 sha256=9bec729a1e77d8bbc5800b14aa81f09290aa18daa40f344103f2c0d1d681531b
@@ -16706,6 +16762,10 @@ sha256=9dd1fce9a051f8176e35c263fcb59b10bf4ffb572b78ca23d1f7f266a0ec5300
 md5=f2b0f1bfd1657b74f6dfbec20bb94e08
 sha256=4b38450a74b569a63bd36a793de25dd84570e47948bf63889c4b808c9f18cf3e
 
+[http://ftp.gnome.org/pub/GNOME/sources/libsoup/2.29/libsoup-2.29.5.tar.bz2]
+md5=7ce3eac3d862c963290e2042c2c1c361
+sha256=3718610c6b6ce118c1f61f9dc0e98a439dbfd7bc7ef3f7ce541617fec8fbce2f
+
 [http://ftp.gnome.org/pub/GNOME/sources/libsoup-2.4/2.4/libsoup-2.4.1.tar.bz2]
 md5=d0fc91ccb9da401e9e40d2f4612bdac9
 sha256=774094746748fb0c8985210de0994accdc7095c222fba42c5623e2137443b6cd
@@ -17678,6 +17738,10 @@ sha256=cb5837924f7234045b4841998987b257977e64d141291068e5b145a3a276df7a
 md5=ef06a3ea963f556948e77971df912303
 sha256=8527c8a9b235a370db3aac606d9262f5e549ef202f114157b45f62564e3dd3bc
 
+[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.27.7.tar.bz2]
+md5=db323884c7dc46e4cd33d0d944fa59a9
+sha256=8e7075fc855ffbcf3c24cbd70b22791759224f98839886d50bba8d659193a950
+
 [http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.27.tar.bz2]
 md5=b3e78977aa79d3754cb7f8143d7ddabd
 sha256=0e99bf9e83f4d1ae0c656741a84dfddfa9c4d2469cf35475f5939d02dc3e4393
@@ -17710,6 +17774,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
@@ -19994,6 +20062,14 @@ sha256=e836560ffae454d4ca0c4cacd1f2a3e8528c5744372a77968bba3b947328ca38
 md5=33088cb4a03b71082f2722b40cef11e0
 sha256=04e6f182f7d1421d06597c5b0909810b9db836a40763d92df0d1a6c798ccb61f
 
+[http://launchpad.net/launch-lite-proj/trunk/0.2.2/+download/netbook-launcher-efl-0.2.2.tar.gz]
+md5=2fb0b0d31f187a40179b397ae3ee995c
+sha256=b1e31652be694731d2565a36f98b6e2fa5b22a2a06c53afe079b76f63dabd587
+
+[http://launchpad.net/launch-lite-proj/0.2/0.2.3/+download/netbook-launcher-efl-0.2.3.tar.gz]
+md5=d38cd496c427ba240ac20770939bee70
+sha256=182b97e9b2f230ee9bf378ca0d62ec8a033acbf882d7cbd94b9a1d94d3d305de
+
 [http://downloads.sourceforge.net/netcat/netcat-0.7.1.tar.bz2]
 md5=0a29eff1736ddb5effd0b1ec1f6fe0ef
 sha256=b55af0bbdf5acc02d1eb6ab18da2acd77a400bafd074489003f3df09676332bb
@@ -21594,6 +21670,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
@@ -21662,6 +21742,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
@@ -21694,6 +21778,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
@@ -22002,6 +22090,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
@@ -22230,6 +22322,10 @@ sha256=2ec40a8d9d9b80ebebea594c407c31962845376287c19e37345371236ed180d5
 md5=3432046ee111efa5b85e5f2cdde8af5c
 sha256=6316a3618efd411e34a48a102a1949b1fdcc562f6e69c4d28f0669913451bbb6
 
+[http://poppler.freedesktop.org/poppler-0.12.3.tar.gz]
+md5=d0ca8344d8d94e27aaba6d432688365d
+sha256=7a4ffe6d2950c446c285700d3b2dc399540a27ce635dd712aff646f02f8dfbcc
+
 [http://poppler.freedesktop.org/poppler-0.5.4.tar.gz]
 md5=053fdfd70533ecce1a06353fa945f061
 sha256=ca0f880a4ff07391e99b443f0e7c9860241df6a6aaa327b9d811b358d94a29c9
@@ -22254,6 +22350,10 @@ sha256=45bd5740b07e6c15db9859a5ee82e2acc9eeec62be537735ae5872fc3648257a
 md5=5c700eb06dda9dafec09cd85225e34d4
 sha256=6bd37c49ab4b22c67ab457c531f841968a3acdebbf9361acea7d7275c903dbc5
 
+[http://poppler.freedesktop.org/poppler-data-0.4.0.tar.gz]
+md5=6975bf8e9ea2cfb42b9ecdbcc257cf57
+sha256=5caf7e10b7b0c6a4e1e753af09be52224e88bb8fbcb47794ad72b99b9e24b109
+
 [http://freshmeat.net/redir/popt/72854/url_bz2/popt-1.13.tar.gz]
 md5=b5c47ce0185c83f947953c77000533bf
 sha256=722b939b14e8b510bbb24e3109a075c7d86b33bec05cb583e76769df9ef2661f
@@ -23526,22 +23626,42 @@ sha256=12b7f014e9ac0b650836ee9e54f58bd728c66591b7de94a9a8bd600bfb217622
 md5=6e913e436a7b0f7572ec1ac77db41fde
 sha256=ded3abdab8333aaf7f451963f32465ca1451a38afb173ef64e0f898d907a6e02
 
+[http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/qpf-freemono-1.0.tar.bz2]
+md5=28688d47cd80d3a6bb833adb22292e15
+sha256=5ac0513efe6270d45a2ada5dc653c434677da4282e026d8c1a9c156cd99e11c8
+
 [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]
+md5=a7fa0210e02f42d5b14245e260bc72c3
+sha256=c8ee6e5e62b0a182dbee85865e56b1572e6875769b8256b39c75b2334a283e45
+
 [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]
+md5=20c040a004f4949b6849658148a78388
+sha256=4b6a122b4f95cf90f9639ca423947e70bba4e567099f9baeada419a51b11924b
+
 [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]
+md5=917d7f8f3ad3c5b94c747b37d0a5e74a
+sha256=c3cdd8f234cbc1694af777dc1739ca4439cd472567d85f333dc11264d6bda7c8
+
 [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]
+md5=02b38aeaf30c17e15b714b9594ca504d
+sha256=3c5890d6b0aee2d4c1e0c6b8101b6b5381985e86bc50dffc338b8601f4aa7ae8
+
 [http://www.openzaurus.org/download/3.5.4/sources/qpf-hunkyserif-0.3.0-r4.tar.bz2]
 md5=02b38aeaf30c17e15b714b9594ca504d
 sha256=3c5890d6b0aee2d4c1e0c6b8101b6b5381985e86bc50dffc338b8601f4aa7ae8
@@ -23550,6 +23670,10 @@ sha256=3c5890d6b0aee2d4c1e0c6b8101b6b5381985e86bc50dffc338b8601f4aa7ae8
 md5=92f6df1c5edb26351332df4f576dbb10
 sha256=c1c5b5ab3431896502c9275daeb47610fb2a840faa6d580e140909a3f4ef7391
 
+[http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/qpf-utopia.tar.bz2]
+md5=fa2563f3c2332c5bcb05add075908f1e
+sha256=599eed45edc9942f4b37858507c2223cb8decb13fea180cf33c6961ad48a33d1
+
 [http://www.openzaurus.org/download/3.5.4/sources/qpf-utopia.tar.bz2]
 md5=fa2563f3c2332c5bcb05add075908f1e
 sha256=599eed45edc9942f4b37858507c2223cb8decb13fea180cf33c6961ad48a33d1
@@ -23578,6 +23702,10 @@ sha256=99e73cec97c62fecaccc4a7f354392ea9964d8c20b0a4a330890c32dbac87732
 md5=1f7ad30113afc500cab7f5b2f4dec0d7
 sha256=883363eb0c94de3d1e36f3ab9e09a8f127418d497213cc1a0ed1a1588ecd66b8
 
+[http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/qt-embedded-2.3.10-snapshot-20060120.tar.gz]
+md5=fec42313fd5508d840240b5dd2fe27eb
+sha256=0a706cf4c2a70dfeff2e886f225007844a4675f5c6387fb46c4b7f7ef327b68e
+
 [http://www.openzaurus.org/download/3.5.4/sources/qt-embedded-2.3.10-snapshot-20060120.tar.gz]
 md5=fec42313fd5508d840240b5dd2fe27eb
 sha256=0a706cf4c2a70dfeff2e886f225007844a4675f5c6387fb46c4b7f7ef327b68e
@@ -23622,6 +23750,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
@@ -24522,7 +24654,7 @@ sha256=2a11ba05f34b2978af3add623a641e0340d39322b4ca2bd26baae743c78de956
 md5=953dc98dbd78fba3a80d554514581d26
 sha256=0431955a17cd687a28c9b005a6afbc11d8db9348cd4ec91c5600f4f662819e07
 
-[http://slimlogic.co.uk/pub/downloads/libscenario/scenario-lib-0.2.0.tar.bz2]
+[http://sources.slimlogic.co.uk/libscenario/scenario-lib-0.2.0.tar.bz2]
 md5=18b370f6ff89546df66fe64a2efd676a
 sha256=d76d0e8267e781e4ed4a93c9f51b7ae1257bfb2fadb8d8f5b64414b5340b1239
 
@@ -24762,6 +24894,10 @@ sha256=57c86e7c17b8af6d6ecbdc17086ad22ec72d815f0db8a475a1d9adef2879f922
 md5=4ba94415125db147efcc1ae76f9703ee
 sha256=6be95f70458d299f28bfc81dee201b3e1c328bc55df00fc7f2c30d7f8f6faba0
 
+[http://downloads.sourceforge.net/sensors-applet/sensors-applet-2.2.4.tar.gz]
+md5=778f637524a90a9b6475ab77b0e90dd9
+sha256=a52214f2cf2b23a49394804dc589be51eecd4b8674f141047a46a550882f28f6
+
 [ftp://ftp.berlios.de/pub/ser/0.9.0/src/ser-0.9.0_src.tar.gz]
 md5=ae1f9b237f0006785ff22eafa1470ac4
 sha256=65eb4c5735859f3ed191437749a85e9fd24a66a6567025f36a0739f9c34c444e
@@ -26414,7 +26550,7 @@ sha256=da26d02c1b98b95343f19ea273b3536beddd94feb2a773a6cb66efebfdff35c0
 md5=5a085296b1147fe970a256a9b2d0f91f
 sha256=f3b5722c145ebeee3523b4941afdaf75d03a56f1922a9d3662dc1715aa24ca34
 
-[http://www.openzaurus.org/download/3.5.4/sources/tickypip-levels_1.1.tar.bz2]
+[http://ewi546.ewi.utwente.nl/mirror/hrw-oe-sources/tickypip-levels_1.1.tar.bz2]
 md5=cfdaae67b3d33351e37021cb0394153c
 sha256=881109774a77e34c61fbf41a839fe02a95cb3e67a0218fe4aebc5e6999cbaa57
 
@@ -27254,6 +27390,10 @@ sha256=6d2ae5d70609df7d2c2b518eca0624c4a59328b277ed114b9e5b57dd030e6e94
 md5=4f896ed631f9be0338df9c5a2145ef82
 sha256=f1b9388f4507185a4ac30bae3383d9e9bbb95075a14dd188c904cacdd8cf4e66
 
+[http://www.draisberghof.de/usb_modeswitch/usb_modeswitch-1.0.7.tar.bz2]
+md5=a9d05c785ade1b06097d53f4423bd5c6
+sha256=ce4985544ea9a252d43cd031823938d51a28e7a9f449ff4403295d1654a3b9d9
+
 [http://www.rpsys.net/openzaurus/patches/archive/usb_pxa27x_udc-r0.patch]
 md5=c8193bc27642fa446d702cfdb9464c2a
 sha256=2101f292449cbacc277aecc5c649de895d501057f299e8e48a7ec50cfb0a200d
@@ -27590,6 +27730,10 @@ sha256=48332dd1a31ac8cf29536111730d6710f79c5e825ca3acd8927e662fb0f25f48
 md5=b05fd8f4420152ca0080a99750863f3f
 sha256=46805e1c19707de043820a1474a8b3775ea3b698a0b539eabd7b86f0f3ad888a
 
+[http://www.freesmartphone.org/sources/vala-0.7.10.tar.bz2]
+md5=6e807644f500d6605a5ee4e1612dd187
+sha256=902392d95e20e8c3e18ad739e24c6727dd90fe281b1ffdbbf509a8d7c50aa8c5
+
 [http://www.freesmartphone.org/sources/vala-0.7.9.tar.bz2]
 md5=f2f8b2914361db599fd6392ec27f7042
 sha256=a71d59cfed750ff402fece5e7d4b656caf3377d5a6bfe5339894f1b13769d58d
@@ -27874,6 +28018,10 @@ sha256=96d659d916fafe555311068c9bf8662b93f10d099b12b17ed04d8a8fffbc72e0
 md5=29d20fec3febf96de43bc27db4b47cfd
 sha256=7107d31e05168febe4cd11bc7fb91ea8f6283b225c7c48a0e9579458d3b5de33
 
+[http://wirbel.htpc-forum.de/w_scan/w_scan-20091230.tar.bz2]
+md5=97cd83d5c174e386d01a364b2d280f2a
+sha256=1a5864559b6a0acb76b9fa66b4e1351acd7d06c4e4a9a2ba323e7eafa4d4788b
+
 [http://www.ibiblio.org/pub/Linux/system/network/misc/wakelan-1.1.tar.gz]
 md5=4a3a31d874967cd6ac761b7d4323e0d5
 sha256=3df5eb8f877648799ab623cf1718ecc6f86eb0c2f51d344d8e860442dcc5cd6f
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index 18df733fa1..5f9e333046 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -8,24 +8,25 @@ PREFERRED_VERSION_cairo		= "1.8.8"
 PREFERRED_VERSION_dbus 		= "1.2.3"
 PREFERRED_VERSION_dropbear      = "0.51"
 PREFERRED_VERSION_fontconfig	= "2.6.0"
-PREFERRED_VERSION_glib-2.0 	= "2.22.1"
-PREFERRED_VERSION_glib-2.0-native = "2.22.1"
+PREFERRED_VERSION_glib-2.0 	= "2.22.4"
+PREFERRED_VERSION_glib-2.0-native = "2.22.4"
 PREFERRED_VERSION_glibmm = "2.22.1"
 PREFERRED_VERSION_gst-pulse 	= "0.9.7"
-PREFERRED_VERSION_gtk+		= "2.18.3"
+PREFERRED_VERSION_gtk+		= "2.18.6"
+PREFERRED_VERSION_gtk+-native	= "2.18.6"
 PREFERRED_VERSION_gtkmm		= "2.18.1"
-PREFERRED_VERSION_hal		= "0.5.13"
+PREFERRED_VERSION_hal		= "0.5.14"
 PREFERRED_VERSION_libgemwidget	= "1.0"
 PREFERRED_VERSION_libgpephone	= "0.4"
 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_libtool 	= "2.2.6b"
+PREFERRED_VERSION_libtool-native = "2.2.6b"
+PREFERRED_VERSION_libtool-cross	= "2.2.6b"
+PREFERRED_VERSION_libtool-sdk	= "2.2.6b"
 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_mplayer       = "0.0+1.0rc3+svnr30165"
 PREFERRED_VERSION_pango 	= "1.24.4"
 #PREFERRED_VERSION_pixman	= "0.13.2"
 PREFERRED_VERSION_pkgconfig	= "0.23"
@@ -47,6 +48,7 @@ UDEV_GE_141 = "1"
 
 PREFERRED_VERSION_usbutils = "0.82"
 PREFERRED_VERSION_wpa-supplicant = "0.6.9"
+PREFERRED_VERSION_xserver-common = "1.32"
 PREFERRED_VERSION_xserver-kdrive = "1.4.0.90"
 
 #
diff --git a/conf/distro/include/fso-autorev.inc b/conf/distro/include/fso-autorev.inc
index f5c7974d5b..fda3cd4729 100644
--- a/conf/distro/include/fso-autorev.inc
+++ b/conf/distro/include/fso-autorev.inc
@@ -11,6 +11,7 @@ SRCREV_pn-fsonetworkd = "${AUTOREV}"
 SRCREV_pn-fsotimed = "${AUTOREV}"
 SRCREV_pn-fsousaged = "${AUTOREV}"
 SRCREV_pn-fso-abyss = "${AUTOREV}"
+SRCREV_pn-fso-boot = "${AUTOREV}"
 SRCREV_pn-fso-apm = "${AUTOREV}"
 SRCREV_pn-fso-term = "${AUTOREV}"
 SRCREV_pn-fso-gsm0710muxd = "${AUTOREV}"
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"
diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc
index 39b1f0764e..f1d16d3b4d 100644
--- a/conf/distro/include/preferred-shr-versions.inc
+++ b/conf/distro/include/preferred-shr-versions.inc
@@ -25,15 +25,18 @@ PREFERRED_VERSION_linux-libc-headers = "2.6.31"
 PREFERRED_VERSION_openssh = "5.2p1"
 
 # upgrades used in Angstrom
-PREFERRED_VERSION_gtk+          = "2.18.3"
+PREFERRED_VERSION_gtk+          = "2.18.6"
+PREFERRED_VERSION_gtk+-native   = "2.18.6"
 PREFERRED_VERSION_hal           = "0.5.13"
-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_libtool       = "2.2.6b"
+PREFERRED_VERSION_libtool-native = "2.2.6b"
+PREFERRED_VERSION_libtool-cross = "2.2.6b"
+PREFERRED_VERSION_libtool-sdk   = "2.2.6b"
 PREFERRED_VERSION_udev          = "141"
 PREFERRED_VERSION_usbutils = "0.82"
 PREFERRED_VERSION_wpa-supplicant = "0.6.9"
+PREFERRED_VERSION_glib-2.0      = "2.22.4"
+PREFERRED_VERSION_glib-2.0-native = "2.22.4"
 UDEV_GE_141 = "1"
 
 ANGSTROM_QT_VERSION ?= "4.6.0"
@@ -46,5 +49,4 @@ PREFERRED_VERSION_qt4-x11-free-gles = "${ANGSTROM_QT_VERSION}"
 
 
 # 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"
+PREFERRED_VERSION_pulseaudio = "0.9.15"
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 06e3f1c8e0..eecf69f24b 100644
--- a/conf/distro/include/sane-srcrevs-fso.inc
+++ b/conf/distro/include/sane-srcrevs-fso.inc
@@ -1,26 +1,27 @@
 # To be included from sane-srcrevs.inc
 
 # FSO Projects -- Cornucopia
-FSO_CORNUCOPIA_SRCREV ?= "70b87d6e8b04f0bf0078702f6467e037eb4fdb28"
+FSO_CORNUCOPIA_SRCREV ?= "429a3d190016b7516b57703faa777c398d843d6c"
 SRCREV_pn-fso-apm ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-fso-boot ?= "241e9212db9f22d3cb0491723a1c41309f4bf486"
 SRCREV_pn-fsodatad ?= "${FSO_CORNUCOPIA_SRCREV}"
-SRCREV_pn-fsodeviced ?= "44a4aabf382995c9f3141ec09b202f0e569a484d"
-SRCREV_pn-fsogsmd ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-fsodeviced ?= "c5094450745643b1b4410a79d7cb72e3f7df28a6"
+SRCREV_pn-fsogsmd ?= "42b94a43ef1dce1225c1f26301c0f4b8aab669e8"
 SRCREV_pn-fsolocationd ?= "${FSO_CORNUCOPIA_SRCREV}"
-SRCREV_pn-fsomusicd ?= "3233c80585dfbc0e77ee5549f9d7fb1a60b5a0f9"
+SRCREV_pn-fsomusicd ?= "${FSO_CORNUCOPIA_SRCREV}"
 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 ?= "c227502c59f4d1de3b3097b3329c2461d6cfa2a2"
-SRCREV_pn-libfsotransport ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-libfsoframework ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-libfsotransport ?= "0c1e8c057b4110b1d8d2c24fd93744c03c304cc8"
 SRCREV_pn-libfsoresource ?= "${FSO_CORNUCOPIA_SRCREV}"
-SRCREV_pn-mickeydbus2 ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-mickeydbus2 ?= "3e75d0ab3e334e303fa1f64b5d87465150c0b58c"
 
 # FSO Projects -- Misc
 SRCREV_pn-dbus-hlid ?= "5df7f49fe8881804aaab544a569fd164c3e93afb"
-SRCREV_pn-frameworkd ?= "439300083459fe66cb93aca20cee185f6fcc52f5"
+SRCREV_pn-frameworkd ?= "e3d6339c5d69e0791c4633f86363159e56126075"
 SRCREV_pn-frameworkd-config-shr_FSO_REV ?= ${SRCREV_pn-frameworkd}
 SRCREV_pn-fso-abyss ?= "aaa3c48296c8589d845f2b6e4314b794750d91cc"
 SRCREV_pn-fso-term ?= "aa0b9c26dee3918a5e9d2809bb36335bda276a0d"
@@ -28,13 +29,13 @@ SRCREV_pn-fso-gpsd ?= "39e810899110a9bb302cf2064e1c0f73541fb4e6"
 SRCREV_pn-fso-gsm0710muxd ?= "abcbcd7cc532a8834906de3fc24c8f8fe7643cd4"
 SRCREV_pn-fso-monitord ?= "b4ae1e9b10e710042624c2cf1a15b91a7d5b1d44"
 SRCREV_pn-fso-sounds ?= "3a4767ec01988bd0fd8f72f0c35d6d36e5fbc815"
-SRCREV_pn-fso-specs ?= "60580a3fc3e8b2c036f9734c59994a5175bfcc1e"
+SRCREV_pn-fso-specs ?= "af3e18e5183ccce29a03eea9fc5f5a0098003cc6"
 SRCREV_pn-gsmd2 ?= "c16883a079aeff8780e5d461ec4e8348537ab4d8"
-SRCREV_pn-libeflvala ?= "707ca862f11feb4fa6945c222a34272b8fd3aebb"
-SRCREV_pn-libfso-glib ?= "4016a7ff20cf53403ab22877eef3a706607f25a3"
-SRCREV_pn-libframeworkd-glib ?= "bdea2ad33bb5c5aa2b996712b99e8dd9b58aed7d"
+SRCREV_pn-libeflvala ?= "294f250f5c20a058f5016aaf674c57d0498070fd"
+SRCREV_pn-libfso-glib ?= "d7d9045b806744bdedf409874009cfde16c2de39"
+SRCREV_pn-libframeworkd-glib ?= "f68fe525c20aa8ef6c6cff70a80e60b91bed89a9"
 SRCREV_pn-libgsm0710 ?= "cd564c8782f018e0d65fb8716c99a6040b5bd166"
-SRCREV_pn-libgsm0710mux ?= "b6793a8191f20adba31b93b2f337cc5451270cf9"
+SRCREV_pn-libgsm0710mux ?= "7934196c47eb80e77105a92cb684656b3614a9fc"
 SRCREV_pn-libpersistence ?= "217ad803745f8ac1f3c72c6715e2c0faefb3fd06"
 FSO_PYTHONHELPERS_SRCREV ?= "63b1dff1bc8ac22efabcee8a90e957c3b2423317"
 SRCREV_pn-mickeydbus ?= "${FSO_PYTHONHELPERS_SRCREV}"
@@ -43,7 +44,7 @@ SRCREV_pn-msmcommd ?= "072226ac1e0f21735cb3bc26cdb87cd87e347afb"
 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 ?= "11e5b817f569e3ce81fa94ed77ed529101368b7f"
+SRCREV_pn-vala-dbus-binding-tool-native ?= "8df9b5aab50066d3f5a525518f902dd26f77bbd7"
 SRCREV_pn-vala-terminal ?= "932285d72e26b965c488f8aa99fe51f7a34231ad"
 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 f4d79268a2..2dfaf34145 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -46,7 +46,6 @@ SRCREV_pn-dfu-util-native ?= "4160"
 SRCREV_pn-disko ?= "f52597b8d5d584811cbe8f9e0bf25ea372526953"
 SRCREV_pn-diversity-daemon ?= "571"
 SRCREV_pn-diversity-radar ?= "453"
-SRCREV_pn-e-tasks ?= "22"
 SRCREV_pn-e-wm-config-illume-shr ?= "bbcec18f0ebd47e4f6eea88b9b774edf7400e752"
 SRCREV_pn-e-wm-illume-dict-pl ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
 SRCREV_pn-e-wm-menu-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
@@ -63,7 +62,7 @@ SRCREV_pn-elementary-theme-neo ?= "2ac643cc273d144bb731a8cbb8ec6b3615de43a0"
 SRCREV_pn-elementary-theme-niebiee ?= "2ac643cc273d144bb731a8cbb8ec6b3615de43a0"
 SRCREV_pn-elementary-theme-sixteen ?= "2ac643cc273d144bb731a8cbb8ec6b3615de43a0"
 SRCREV_pn-elf2flt ?= "1786"
-SRCREV_pn-elmdentica ?= "171"
+SRCREV_pn-elmdentica ?= "215"
 SRCREV_pn-enlazar ?= "37"
 SRCREV_pn-enotes ?= "19"
 SRCREV_pn-epdfview ?= "346"
@@ -102,7 +101,7 @@ SRCREV_pn-guitartune ?= "11"
 SRCREV_pn-gypsy ?= "134"
 SRCREV_pn-hildon-1 ?= "14429"
 SRCREV_pn-icon-theme-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
-SRCREV_pn-illume-keyboards-shr ?= "c23bde500152c303971b4c2ec5c463d760b7cc14"
+SRCREV_pn-illume-keyboards-shr ?= "7bcdd55dc0cf6f3b50fd0226345592f538301b8a"
 SRCREV_pn-illume-theme-asu ?= "4881"
 SRCREV_pn-illume-theme-freesmartphone ?= "b1b0f6adc59e6f72a3929771058e3750bf181bc5"
 SRCREV_pn-intone ?= "75"
@@ -148,7 +147,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 ?= "058cbf4220fd2f1cd970bf553c044cb178e3804e"
+SRCREV_pn-linux-openmoko-2.6.32 ?= "04697d0e4011a0f2942411acff56f9bc9ca6c11a"
 SRCREV_pn-linux-openmoko-devel ?= "a15608f241a40b41fed5bffe511355c2067c4e88"
 SRCREV_pn-linux-openmoko-shr-devel ?= "a15608f241a40b41fed5bffe511355c2067c4e88"
 SRCREV_pn-linux-openmoko-shr-drm-devel ?= "e62a4ae1c6783f41b41a9ac3d258786586b65a40"
@@ -157,8 +156,8 @@ SRCREV_pn-llvm-gcc4 ?= "374"
 SRCREV_pn-llvm-gcc4-cross ?= "374"
 SRCREV_pn-madbutterfly ?= "ecd1842714b5e982f3138cbdd358517d57be6aa3"
 SRCREV_pn-maemo-mapper ?= "118"
-SRCREV_pn-mamona_input_methods ?= "7e6a8cc947689a045d0fba90015da599275347d9"
-SRCREV_pn-mamonaim_e_applet ?= "51c747849f71981bd1dc9eb1807df4993ad97d04"
+SRCREV_pn-mamona-input-methods ?= "4a8f11973021b8b4f157f5743e00f9f9a3c4802b"
+SRCREV_pn-mamonaim-e-applet ?= "a1ba7e8a388ffce3cca92bad059cd801e7733a7a"
 SRCREV_pn-matchbox-config-gtk ?= "1614"
 SRCREV_pn-matchbox-desktop-2 ?= "2096"
 SRCREV_pn-matchbox-keyboard ?= "1910"
@@ -181,8 +180,8 @@ SRCREV_pn-mplayer-maemo ?= "342"
 SRCREV_pn-msn-pecan ?= "e795b33b29d792f19fcf699275eb966dc68be257"
 SRCREV_pn-multitap-pad ?= "373"
 SRCREV_pn-mux ?= "72460e890dbb15edbf7dc193116be0dcf9794a8b"
-SRCREV_pn-navit ?= "2902"
-SRCREV_pn-navit-icons ?= "2871"
+SRCREV_pn-navit ?= "2934"
+SRCREV_pn-navit-icons ?= "2927"
 SRCREV_pn-neod ?= "4617"
 SRCREV_pn-neomis ?= "6"
 SRCREV_pn-net-snmp ?= "17367"
@@ -246,7 +245,7 @@ SRCREV_pn-openocd ?= "517"
 SRCREV_pn-openocd-native ?= "517"
 SRCREV_pn-opimd-utils ?= "7321c3f1a3cd781f9ed13ea3cac38879429dd420"
 SRCREV_pn-opkg ?= "446"
-SRCREV_pn-opkg-native ?= "446"
+SRCREV_pn-opkg-native ?= "519"
 SRCREV_pn-opkg-sdk ?= "446"
 SRCREV_pn-opkg-utils ?= "4578"
 SRCREV_pn-opkg-utils-native ?= "4595"
@@ -335,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 ?= "45060"
+EFL_SRCREV ?= "45765"
 SRCREV_pn-edb-native ?= "${EFL_SRCREV}"
 SRCREV_pn-edb ?= "${EFL_SRCREV}"
 SRCREV_pn-eina-native ?= "${EFL_SRCREV}"
diff --git a/conf/distro/include/sane-toolchain-java.inc b/conf/distro/include/sane-toolchain-java.inc
new file mode 100644
index 0000000000..a0f579252c
--- /dev/null
+++ b/conf/distro/include/sane-toolchain-java.inc
@@ -0,0 +1,6 @@
+# Set PREFFERED and VERSION stuff for working java-toolchain
+
+PREFERRED_PROVIDER_virtual/java-initial = "jamvm-initial"
+PREFERRED_PROVIDER_virtual/java-native = "jamvm-native"
+PREFERRED_VERSION_classpath-native = "0.98"
+PREFERRED_VERSION_classpath = "0.98"
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/include/shr-autorev.inc b/conf/distro/include/shr-autorev.inc
index 75f389cf83..6a8ef29fe2 100644
--- a/conf/distro/include/shr-autorev.inc
+++ b/conf/distro/include/shr-autorev.inc
@@ -16,3 +16,5 @@ SRCREV_pn-opimd-utils = "${AUTOREV}"
 SRCREV_pn-shr-installer = "${AUTOREV}"
 SRCREV_pn-shr-wizard = "${AUTOREV}"
 
+SRCREV_pn-ventura = "${AUTOREV}"
+SRCREV_pn-emtooth = "${AUTOREV}"
diff --git a/conf/distro/jlime-2010.1.conf b/conf/distro/jlime-2010.1.conf
index c60d65ddb8..9e18e9c8bd 100644
--- a/conf/distro/jlime-2010.1.conf
+++ b/conf/distro/jlime-2010.1.conf
@@ -31,7 +31,7 @@ DISTRO_EXTRA_RDEPENDS = "wireless-tools nano keymaps tslib-calibrate \
 #<>Our Image files should look abit better.
 #<>
 #<>------------------------------------------------------------------<
-IMAGE_NAME = "JLiMe-${IMAGE_BASENAME}-2009.1-${MACHINE}"
+IMAGE_NAME = "${DISTRO_NAME}-${IMAGE_BASENAME}-${DISTRO_VERSION}-${MACHINE}"
 SPLASH = "psplash"
 
 #
@@ -71,14 +71,14 @@ PREFERRED_VERSION_gcc = "4.4.2"
 PREFERRED_VERSION_gcc-cross = "4.4.2"
 PREFERRED_VERSION_gcc-cross-initial = "4.4.2"
 PREFERRED_VERSION_gcc-cross-intermediate = "4.4.2"
-PREFERRED_VERSION_binutils = "2.18"
-PREFERRED_VERSION_binutils-cross = "2.18"
-PREFERRED_VERSION_coreutils-native = "6.0"
+PREFERRED_VERSION_binutils = "2.20"
+PREFERRED_VERSION_binutils-cross = "2.20"
+PREFERRED_VERSION_coreutils-native = "7.2"
 
 #
 # Target OS & FPU system
 # 
-TARGET_OS = "linux"
+TARGET_OS ?= "linux"
 TARGET_FPU_sh = "soft"
 TARGET_FPU_arm = "soft"
 TARGET_FPU_armeb = "soft"
@@ -103,13 +103,14 @@ require conf/distro/include/sane-srcrevs.inc
 # Framebuffer & X
 #
 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_virtual/libgl = "mesa-xlib"
 PREFERRED_PROVIDER_tslib = "tslib"
 PREFERRED_VERSION_mesa = "7.6"
 PREFERRED_VERSION_mesa-dri = "7.6"
 PREFERRED_VERSION_mesa-xlib = "7.6"
+SERVER ?= " xserver-xorg xf86-input-evdev xf86-input-keyboard xf86-input-mousexf86-video-fbdev " 
 
 #
 # General Userspace
diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf
index 5417f5b06d..6872bb6abf 100644
--- a/conf/distro/shr.conf
+++ b/conf/distro/shr.conf
@@ -49,6 +49,7 @@ ANGSTROM_BLACKLIST_pn-bluez-utils = "bluez-utils 3.x has been replaced by bluez4
 ANGSTROM_BLACKLIST_pn-atd = "atd has been replaced by atd-over-fso"
 ANGSTROM_BLACKLIST_pn-update-alternatives-cworth-native = "update-alternatives-cworth-native has been replaced by opkg implementation of u-a script"
 ANGSTROM_BLACKLIST_pn-update-alternatives-cworth = "update-alternatives-cworth has been replaced by opkg implementation of u-a script"
+ANGSTROM_BLACKLIST_pn-qt4-x11-free-gles = "qt4-x11-free is fine even without gles"
 
 CVS_TARBALL_STASH += "http://build.shr-project.org/sources/"
 
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"
 
diff --git a/conf/machine/eee701.conf b/conf/machine/eee701.conf
new file mode 100644
index 0000000000..0c4b965655
--- /dev/null
+++ b/conf/machine/eee701.conf
@@ -0,0 +1,31 @@
+#-----------------------------------------------------------------------------
+#@TYPE: Machine
+#@NAME: eeepc 701
+#@DESCRIPTION: Machine configuration for the eeepc 701 netbook
+#-----------------------------------------------------------------------------
+
+require i686-generic.conf
+
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
+MACHINE_DRI_MODULES ?= "i915"
+
+MACHINE_FEATURES +=" wifi alsa "
+MACHINE_DISPLAY_WIDTH_PIXELS = "800"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "480"
+MACHINE_DISPLAY_ORIENTATION = "0"
+XSERVER ?= "xserver-xorg \
+           xf86-video-intel \
+           xf86-input-evdev \
+	   xf86-input-keyboard \
+	   xf86-input-mouse \
+	   xf86-input-synaptics"
+
+IMAGE_FSTYPES += "tar.gz"
+
+PREFERRED_PROVIDER_virtual/kernel ?= "linux"
+PREFERRED_VERSION_linux ?= "2.6.32"
+
+GLIBC_ADDONS = "nptl"
+GLIBC_EXTRA_OECONF = "--with-tls"
+
diff --git a/conf/machine/htcdream.conf b/conf/machine/htcdream.conf
index d09782c40f..40d75d74eb 100644
--- a/conf/machine/htcdream.conf
+++ b/conf/machine/htcdream.conf
@@ -9,4 +9,4 @@ MACHINE_DISPLAY_HEIGHT_PIXELS = "480"
 
 MACHINE_FEATURES = "kernel26 touchscreen screen phone gps usbgadget bluetooth keyboard ext2" 
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-msm7xxxx"
+PREFERRED_PROVIDER_virtual/kernel = "linux-leviathan"
diff --git a/conf/machine/htcleo.conf b/conf/machine/htcleo.conf
new file mode 100644
index 0000000000..52d4a42b78
--- /dev/null
+++ b/conf/machine/htcleo.conf
@@ -0,0 +1,10 @@
+#@TYPE: Machine
+#@NAME: HTC Leo
+#@DESCRIPTION: Machine configuration for HTC Leo smartphone (aka HTC HD2)
+
+require conf/machine/include/htc-qsd8.inc
+
+MACHINE_DISPLAY_WIDTH_PIXELS = "480"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "800"
+
+MACHINE_FEATURES = "kernel26 touchscreen screen phone gps compass usb keyboard"
diff --git a/conf/machine/include/htc-msm7.inc b/conf/machine/include/htc-msm7.inc
index 5d7596f38d..32a48807af 100644
--- a/conf/machine/include/htc-msm7.inc
+++ b/conf/machine/include/htc-msm7.inc
@@ -1,9 +1,19 @@
 # kernel
-PREFERRED_PROVIDER_virtual/kernel = "linux-msm7xxxx"
+PREFERRED_PROVIDER_virtual/kernel = "linux-msm7"
 
 # xserver
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
-XSERVER = "xserver-kdrive-fbdev"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+
+XSERVER = " \
+	xserver-xorg \
+	xserver-xorg-extension-glx \
+	xserver-xorg-extension-dri \
+	xf86-input-evtouch \	
+	xf86-input-evdev \
+	xf86-input-mouse \
+	xf86-input-keyboard \
+	xf86-video-msm \
+"
 
 # capability database
 MACHINE_DISPLAY_WIDTH_PIXELS = "480"
@@ -15,9 +25,6 @@ MACHINE_CLASS = "htc-msm7"
 # features
 MACHINE_FEATURES = "kernel26 touchscreen screen phone gps usb keyboard"
 
-# filesystems
-IMAGE_FSTYPES = "tar.gz"
-
 # CPU
 require conf/machine/include/tune-arm1136-novfp.inc
 
diff --git a/conf/machine/include/htc-qsd8.inc b/conf/machine/include/htc-qsd8.inc
new file mode 100644
index 0000000000..ac3e7d22ee
--- /dev/null
+++ b/conf/machine/include/htc-qsd8.inc
@@ -0,0 +1,30 @@
+# kernel
+PREFERRED_PROVIDER_virtual/kernel = "linux-qsd8"
+
+# xserver
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+
+XSERVER = " \
+	xserver-xorg \
+	xserver-xorg-extension-glx \
+	xserver-xorg-extension-dri \
+	xf86-input-evtouch \	
+	xf86-input-evdev \
+	xf86-input-mouse \
+	xf86-input-keyboard \
+	xf86-video-msm \
+"
+
+# capability database
+MACHINE_DISPLAY_WIDTH_PIXELS = "480"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
+
+# use this for overrides
+MACHINE_CLASS = "htc-qsd8"
+
+# features
+MACHINE_FEATURES = "kernel26 touchscreen screen phone gps usb keyboard"
+
+# CPU
+TARGET_ARCH = "arm"
+require conf/machine/include/tune-cortexa8.inc
diff --git a/conf/machine/include/kirkwood.inc b/conf/machine/include/kirkwood.inc
index c3c59aa48b..8507857b11 100644
--- a/conf/machine/include/kirkwood.inc
+++ b/conf/machine/include/kirkwood.inc
@@ -11,7 +11,7 @@ USE_DEVFS = "0"
 PREFERRED_PROVIDER_virtual/bootloader = ""
 PREFERRED_PROVIDER_virtual/kernel = "linux-kirkwood"
 
-MACHINE_KERNEL_PR = "r14"
+MACHINE_KERNEL_PR = "r16"
 
 IMAGE_FSTYPES += "tar.gz ubi"
 SERIAL_CONSOLE = "ttyS0 115200"
diff --git a/conf/machine/nokia900.conf b/conf/machine/nokia900.conf
new file mode 100644
index 0000000000..4880ea47de
--- /dev/null
+++ b/conf/machine/nokia900.conf
@@ -0,0 +1,30 @@
+#@TYPE: Machine
+#@NAME: Nokia 900 internet tablet
+#@DESCRIPTION: Machine configuration for the Nokia 900
+TARGET_ARCH = "arm"
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+XSERVER = "xserver-xorg \
+           xf86-input-evdev \
+           xf86-video-fbdev \
+           xf86-video-omapfb "
+
+GUI_MACHINE_CLASS = "bigscreen"
+MACHINE_DISPLAY_WIDTH_PIXELS = "800"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "480"
+
+require conf/machine/include/omap3.inc
+
+ROOT_FLASH_SIZE = "100"
+EXTRA_IMAGECMD_jffs2_nokia900 = "--pad --little-endian --eraseblock=0x20000 -n"
+
+IMAGE_FSTYPES ?= "jffs2"
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+
+#use this if you are using the nokia initfs
+ROOTFS_POSTPROCESS_COMMAND += " remove_init_link; "
+
+MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget vfat"
diff --git a/conf/machine/om-gta01.conf b/conf/machine/om-gta01.conf
index e1c5127072..822403a710 100644
--- a/conf/machine/om-gta01.conf
+++ b/conf/machine/om-gta01.conf
@@ -7,28 +7,36 @@
 TARGET_ARCH = "arm"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-2.6.24"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 
-# SHR-specific overrides to the machine.conf file
+# If you want to have KMS enabled in default kernel, uncomment linux-openmoko-shr-drm-devel
 PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-shr-devel"
-PREFERRED_PROVIDER_virtual/xserver_shr = "xserver-xorg"
-PREFERRED_PROVIDER_xf86-video-fbdev_shr = "xf86-video-fbdev"
-PREFERRED_PROVIDER_virtual/libgl = "mesa"
-XSERVER_shr = "xserver-xorg xf86-video-fbdev xf86-input-evdev xf86-input-keyboard"
+#PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-shr-drm-devel"
+#PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-2.6.31"
+#PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-2.6.32"
+
+PREFERRED_PROVIDER_virtual/libgl_shr = "mesa"
 
 UBOOT_ENTRYPOINT = "30008000"
 
 OLDEST_KERNEL_linux-gnueabi = "2.6.24"
 
-MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone vfat ext2"
+MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone wifi vfat ext2"
 MACHINE_DISPLAY_WIDTH_PIXELS = "480"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
 MACHINE_DISPLAY_ORIENTATION = "0"
 MACHINE_DISPLAY_PPI = "285"
-XSERVER = "xserver-kdrive-fbdev"
+XSERVER ?= "xserver-xorg \
+           xf86-input-tslib \
+           xf86-input-evdev \
+           xf86-video-glamo \
+           xf86-input-keyboard \
+           xf86-input-mouse"
 
 # fbreader specific
 READER_RESOLUTION = "480x640"
-READER_ARCH	  = "openzaurus"
+READER_ARCH       = "desktop"
+READER_UI         = "gtk"
 
 # package machine specific modules
 MACHINE_EXTRA_RRECOMMENDS = "\
@@ -47,9 +55,33 @@ MACHINE_EXTRA_RRECOMMENDS = "\
 # used by some images
 ROOT_FLASH_SIZE = "60"
 
+IMAGE_FSTYPES += "tar.gz jffs2 ubi"
+
 # extra jffs2 tweaks
-IMAGE_FSTYPES += "jffs2"
-EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x4000 --pad -n"
+EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pagesize=0x800 \
+  --no-cleanmarkers --pad -n ; sumtool --eraseblock=0x20000 --no-cleanmarkers \
+  --littleendian --pad \
+  -i ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
+  -o ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.summary ; \
+  mv ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 \
+  ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.nosummary ; \
+  mv ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2.summary \
+  ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2"
+
+# do ubiattach /dev/ubi_ctrl -m 4
+# From dmesg:
+# UBI: smallest flash I/O unit:    512
+# UBI: logical eraseblock size:    15360 bytes
+# from ubiattach stdout:
+# UBI device number 0, total 3907  LEBs
+MKUBIFS_ARGS = "-m 512 -e 15360 -c 2047"
+
+# do ubiattach /dev/ubi_ctrl -m 4
+# from dmesg:
+# UBI: smallest flash I/O unit:    512
+# UBI: physical eraseblock size:   16384 bytes (16 KiB)
+# UBI: sub-page size:              512
+UBINIZE_ARGS = "-m 512 -p 16KiB -s 512 -O 512"
 
 # build / upload tools
 EXTRA_IMAGEDEPENDS += "dfu-util-native"
@@ -58,4 +90,3 @@ module_autoload_snd-soc-neo1973-wm8753 = "snd-soc-neo1973-wm8753"
 
 # tune for S3C24x0
 include conf/machine/include/tune-arm920t.inc
-
diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf
index ca4c050af3..eb48d01aac 100644
--- a/conf/machine/om-gta02.conf
+++ b/conf/machine/om-gta02.conf
@@ -14,13 +14,10 @@ PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-shr-devel"
 #PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-shr-drm-devel"
 #PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-2.6.31"
 
-PREFERRED_PROVIDER_virtual/xserver_shr = "xserver-xorg"
 PREFERRED_PROVIDER_virtual/libgl_shr = "mesa-dri"
 # Override only for shr as it needs mesa-dri_git and ie angstrom has preferred_version set to 7.6
 MACHINE_DRI_MODULES_shr = "glamo"
 
-XSERVER_shr = "xserver-xorg xf86-video-glamo xf86-input-evdev xf86-input-keyboard xf86-input-mouse"
-
 UBOOT_ENTRYPOINT = "30008000"
 
 OLDEST_KERNEL_linux-gnueabi = "2.6.24"
@@ -32,13 +29,15 @@ MACHINE_DISPLAY_ORIENTATION = "0"
 MACHINE_DISPLAY_PPI = "285"
 XSERVER ?= "xserver-xorg \
            xf86-input-tslib \
+           xf86-input-evdev \
            xf86-video-glamo \
-           xf86-input-keyboard"
+           xf86-input-keyboard \
+           xf86-input-mouse"
 
 # fbreader specific
 READER_RESOLUTION = "480x640"
-READER_ARCH	  = "desktop"
-READER_UI	  = "gtk"
+READER_ARCH       = "desktop"
+READER_UI         = "gtk"
 
 # package machine specific modules
 MACHINE_EXTRA_RRECOMMENDS = "\
diff --git a/conf/machine/oxnas.conf b/conf/machine/oxnas.conf
deleted file mode 100644
index 08213297c8..0000000000
--- a/conf/machine/oxnas.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-#@TYPE: Machine
-#@NAME: OXE810(D)SE NAS devices
-#@DESCRIPTION: Machine configuration for Oxford OXE810(D)SE NAS devices http://www.oxsemi.com/products/storage/nas.html
-
-TARGET_ARCH = "arm"
-
-MACHINE_FEATURES = "kernel26 ext2 pci usbhost ethernet serial raid uboot"
-
-SERIAL_CONSOLE = "115200 ttyS0"
-
-PREFERRED_PROVIDER_virtual/kernel = "linux"
-
-KERNEL_IMAGETYPE = "uImage"
-
-PREFERRED_VERSION_u-boot = "1.1.2"
-UBOOT_LOADADDRESS = "0x48008000"
-UBOOT_ENTRYPOINT = "0x48008000"
-UBOOT_ARCH = "arm"
-
-require conf/machine/include/tune-arm926ejs.inc
diff --git a/conf/machine/rx1950.conf b/conf/machine/rx1950.conf
index 1495e867d9..fb70437bd8 100644
--- a/conf/machine/rx1950.conf
+++ b/conf/machine/rx1950.conf
@@ -10,12 +10,12 @@ TARGET_ARCH = "arm"
 # Samsung S3C2xxx CPU
 require conf/machine/include/tune-arm920t.inc
 
-ROOT_FLASH_SIZE = "32"
+ROOT_FLASH_SIZE = "64"
 VOLATILE_STORAGE_SIZE = "64"
 MACHINE_GUI_CLASS = "smallscreen"
 MACHINE_DISPLAY_WIDTH_PIXELS = "240"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda bluetooth wifi usbgadget screen vfat"
+MACHINE_FEATURES = "kernel26 touchscreen apm alsa irda wifi usbgadget screen vfat"
 
 #
 # Software/packages selection