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

26 files changed, 292 insertions, 280 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index bf1bb73e3f..25aaeb4417 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -806,10 +806,18 @@ sha256=7526a31de615a662cb09e915f26e5b151eda364240d983df6232aac8b9333f3a
 md5=581cf6ea9ef358df874359cc8cb9af69
 sha256=6fa351b3efc78cff4daa1f42386ba8435474bc121b4358a7d08bd7c9fb63aaef
 
+[http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.8/NetworkManager-0.8.tar.bz2]
+md5=d343e22f132754696654511acde354c2
+sha256=4ac38f5c6ddbbcc67601ba898dd475457e2d259b77f9680eee51cb07f19c1b05
+
 [http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/0.7/NetworkManager-openvpn-0.7.1.tar.bz2]
 md5=3637145716d5a2d55af0d713e4f05c68
 sha256=7c6a7b9b8c6ccf3e2fbf2431b9fb2035f99e1d78065f3344f667e2f108f38d5b
 
+[http://ftp.gnome.org/pub/GNOME/sources/NetworkManager-openvpn/0.8/NetworkManager-openvpn-0.8.tar.bz2]
+md5=5039d6a840be45445db876cd71d64d20
+sha256=8fd6f25093ade66a98ce1327f24ef953351aabf02870c5dcf12500a6b7f08d43
+
 [http://divmod.org/trac/attachment/wiki/SoftwareReleases/Nevow-0.9.32.tar.gz?format=raw]
 md5=75828090af2b26f69fe4a7f148a400f6
 sha256=bc35ce187481db91f047055b3edbce49c14d291b1a2eb3e915e9c1c511620f9a
@@ -1650,6 +1658,10 @@ sha256=13013cd19cb165825f4ef5cc790b0e103705f68ece470fd12012db97e3e60839
 md5=40f19a26cbfa35de8346efe582b5d984
 sha256=ea09581b3a31e3409968876461da3e384dcb0000abbb0060ae14e4fccb4994e1
 
+[http://mirror.its.uidaho.edu/pub/savannah/acl/acl-2.2.49.src.tar.gz]
+md5=181445894cca986da9ae0099d5ce2d08
+sha256=b9c7f4752e4ef4930a62fa5aa0d7efe1cba2b5a3a2d6ee2b45c0a70c72b7e5d5
+
 [http://downloads.sourceforge.net/acpid/acpid-1.0.10.tar.gz]
 md5=61156ef32015c56dc0f2e3317f4ae09e
 sha256=22703ce0dd7305aca01bc9ac741659c32b1593f1d6fde492df7f01067a534760
@@ -2442,6 +2454,10 @@ sha256=dd3629e6ba6f638962f3a60035208facf6155397000c86b5f2f7ca2990ef59e1
 md5=537dc236f4654dd5760e0f39484222a1
 sha256=818a18c1ace9bc3e5b92bc91db1d62c859023cd16444d41692ecb3606cc6868c
 
+[http://mirror.its.uidaho.edu/pub/savannah/attr/attr-2.4.44.src.tar.gz]
+md5=d132c119831c27350e10b9f885711adc
+sha256=9f6214b8e53f4bba651ac5a72c0f6193b12aa21fbf1d675d89a7b4bc45264498
+
 [ftp://oss.sgi.com/projects/xfs/cmd_tars/attr_2.4.43-1.tar.gz]
 md5=91583a14bcbd637adaa9b07ea49c5d4b
 sha256=d358b233b3e2ad235e63fd8697e337006fc7506844e424b0d9dd7a24affec5bf
@@ -3682,78 +3698,6 @@ sha256=e4f5bc9be311a746bd37f5607d3c225462d7d9294e8b3c692f9a39717b65d843
 md5=c17e047d1a6a3f3188de929dc8582e01
 sha256=58eb43e7e781a6b61e452fa36fa03198ef44c742da80c8a1b60be073e4ab949b
 
-[http://www.busybox.net/downloads/busybox-1.00.tar.gz]
-md5=fa62459e098fc00b22772aaf2e75bc98
-sha256=f3e1592607d42cab45387790af0cb0fea2d061f70f8679672a4397bcfe3562e5
-
-[http://www.busybox.net/downloads/busybox-1.01.tar.gz]
-md5=63041103f88192d209f6b1d7944fd118
-sha256=1d7c1b1931549ac294f438c50148da052f69f501676ba361034ef72b111605d3
-
-[http://www.busybox.net/downloads/busybox-1.11.0.tar.gz]
-md5=2e5b08cd8a76daf4a185c69b8070797f
-sha256=458e4f20723a1527be0b563896b2d314bf2bb0063d5627f0c6536ed07f544771
-
-[http://busybox.net/downloads/fixes-1.11.1/busybox-1.11.1-basename.patch]
-md5=f7780f73d3338b17d5f2eedbe76132de
-sha256=0f3129eff8420f2e3da237a95dbb6234ef380ac4343cb192eccd69fe8c840c7b
-
-[http://busybox.net/downloads/fixes-1.11.1/busybox-1.11.1-tar.patch]
-md5=fb01aea02faf4c5107292454745806ff
-sha256=6a045d34561b8548ae08ca7d0803d77fc2b70bdfc61793aa0a99e59a91059443
-
-[http://www.busybox.net/downloads/busybox-1.11.1.tar.gz]
-md5=9c9f06c2d949c6de844c7bed8eb47064
-sha256=cf3957b4548df051cd0971d179cb92dc0fcab3839977ddb70aae81c14cd04b03
-
-[http://www.busybox.net/downloads/busybox-1.11.3.tar.gz]
-md5=d113f2777e4f508faa8b674ece87a37b
-sha256=f2b433270f22aad86f61cef61d95338aaa63dbe2f9468b9ed5defd1c01c9645f
-
-[http://busybox.net/downloads/fixes-1.13.2/busybox-1.13.2-depmod.patch]
-md5=7c9dfb5dcd66a1d6e837e72ad0cb05d4
-sha256=35e3854599a074ce1b47872ab1b97a625ed7d1ab3345b918f7f60524f5e390c5
-
-[http://busybox.net/downloads/fixes-1.13.2/busybox-1.13.2-init.patch]
-md5=7afb3a1b474742bc198b3c8450ab9a7e
-sha256=39a8efb5a50c56feb733e519365b4e188c25c0e925a1a63cc1ace9735a80100f
-
-[http://busybox.net/downloads/fixes-1.13.2/busybox-1.13.2-mdev.patch]
-md5=a72d169e9545e26257032e0e367feb95
-sha256=fd4a64c6a83e07586de0360258162c5bf431f164b3980301185743e4029940df
-
-[http://busybox.net/downloads/fixes-1.13.2/busybox-1.13.2-modprobe.patch]
-md5=b2b9d0992b055816077ec9e0e4ee7775
-sha256=ba540cad8a029ff2eec7b078e31a308f408c074a13160aa7eba80f5ca18ee703
-
-[http://busybox.net/downloads/fixes-1.13.2/busybox-1.13.2-tar.patch]
-md5=90d093817855bc63ad16fbb8524f80df
-sha256=9427fa9b45f3c322bf4fe2463c99c972e6ae03df630899b38be4f29133708a0e
-
-[http://www.busybox.net/downloads/busybox-1.13.2.tar.gz]
-md5=aeb526108f13b91c02b115c8d86f9659
-sha256=03fc9dbdc6f44afd2da55c0ab36646d2d063708cc35f3f4569b913b064f11d83
-
-[http://www.busybox.net/downloads/busybox-1.14.3.tar.gz]
-md5=dfb197b8de260ff284f7222ed23614fe
-sha256=b5a0c76d414cca97fb21622a5d09fa5a58f59890f5c9ce4f8b851c4e8b73a163
-
-[http://www.busybox.net/downloads/busybox-1.15.3.tar.gz]
-md5=f24d830f292d1ad27910ef226d6b2ef8
-sha256=dd8e07708d380a44cddaccce731c0e39f4d47ad921ab886644b6258fdf80b590
-
-[http://www.busybox.net/downloads/busybox-1.2.0.tar.gz]
-md5=6af69ebbbf8adc874ccb6d67dca95df5
-sha256=df6e3b0079194251a2ff68d7be7b06025c79f4fe62f4a73158ee52ff4bc515a0
-
-[http://www.busybox.net/downloads/busybox-1.2.1.tar.gz]
-md5=b9c853b2c453e80381077288f40035b3
-sha256=984b7974670d4f0291094ea2a36ee21fe46591f36cb51f95292dbe143c1eeab4
-
-[http://www.busybox.net/downloads/busybox-1.5.0.tar.gz]
-md5=158ccadd830fe6cb3d21a109f398e037
-sha256=08ef1e87c7198fb6d7c0a5f830fc2d99e5fd077dbb7d4ca1b66117ae924f6df3
-
 [http://busybox.net/downloads/fixes-1.7.2/busybox-1.7.2-ash.patch]
 md5=4149857c0b2c7f3d52a1f2cec5d7778d
 sha256=73706e7d77144a6270da02ede61cde3c2e3b0e716d879737ac9d478b29233ba9
@@ -3770,26 +3714,6 @@ sha256=5117584a563c512b68cd9678d3cf54e6186f5a062836398791385f8ed73cca86
 md5=c211189556c59a2665af45bffe5a5878
 sha256=f44c3c2d7d9b3fc8a5f9fb6ac587ae4170d2515d72f9e76deb8c071ce9847abe
 
-[http://www.busybox.net/downloads/busybox-1.7.2.tar.gz]
-md5=34c76dc55004d8d5dcea884e0e99bc21
-sha256=e0eb7d59ba996a58608999998ad630c67b93c05af4eafea29770c4839c0e5461
-
-[http://www.busybox.net/downloads/busybox-1.8.2.tar.gz]
-md5=12851f4844bcda78ef4ba9168e16cc56
-sha256=3400bf837d214adc8522d1e78bae936c0c2cde2127ab1ee095587b946a6b5131
-
-[http://busybox.net/downloads/fixes-1.9.1/busybox-1.9.1-lineedit.patch]
-md5=9e5d99b89d79dd117310ee675322d9f2
-sha256=3fe138dc567d0fcda304f89523686aaec2f83c9193403cfc68d1ba32fa554511
-
-[http://www.busybox.net/downloads/busybox-1.9.1.tar.gz]
-md5=b9ae7be6e9a112ea5653855bbe70b501
-sha256=722071b14aba77ce6e2a83608b2ae4d4dab318d7f339d83e6c1719886b21aed9
-
-[http://www.busybox.net/downloads/busybox-1.9.2.tar.gz]
-md5=b31e4d1648df9259e2426839bc067038
-sha256=9bfc34aa8104caba9c0f089aab908700ff4ad76c2b7ca6d5f4c93d842041b1a7
-
 [http://downloads.sourceforge.net/bvi/bvi-1.3.1.src.tar.gz]
 md5=b9d77c57bda2e019207a1874d9bb4dea
 sha256=c94dbfa293cbc61b8571d025e90fd1f06a34f8d4e5b11a59856bfc1f13014de3
@@ -6178,6 +6102,10 @@ sha256=9ec176847b1e01cd2083cd578e804fda2c619d0f465cd752ec11b38099f75f7f
 md5=d0f3b1adca33a68867bf50f000060cd6
 sha256=a0d03208e335610defc3049d8dd03f4ec7fcf477f44c4897b3f68adc478237ee
 
+[http://cgit.freedesktop.org/~david/eggdbus/snapshot/eggdbus-0.6.tar.bz2]
+md5=0a111faa54dfba2cf432c2c8e8a76e06
+sha256=3ad26e271c1a879bafcd181e065fe0ed53b542299a773c3188c9edb25b895ed1
+
 [http://rogers.com/eject-2.1.5.tar.gz]
 md5=b96a6d4263122f1711db12701d79f738
 sha256=ef9f7906484cfde4ba223b2682a37058f9a3c7d3bb1adda7a34a67402e2ffe55
@@ -12586,6 +12514,10 @@ sha256=1e2cc080e654c1839c5cb4b4adf4c62a23e7da208427f3ba0b16cfed9e5cfa98
 md5=51d584b7b6115528c21e8ea32250f2b1
 sha256=754038a9eb8f1d0d6559d5b124a68e1e530a76366cff251d79536ec89e2fda21
 
+[http://www.ibr.cs.tu-bs.de/projects/ibr-dtn/releases/ibrdtn-0.1.1.tar.gz]
+md5=eb19ac9c283e63afd77215973193f136
+sha256=28e9d09e9d2f24f688f66c4fb4b60c374840cb4f754396889bf7725a1ad29e3d
+
 [http://xorg.freedesktop.org/releases/individual/app/iceauth-1.0.2.tar.bz2]
 md5=7ab8b64edf0212a9d9a3c8129901a450
 sha256=06401591de57a2c4cf2255e3d5230ea19351c5516cf8dae98c61092392bab5bb
@@ -13534,6 +13466,38 @@ sha256=6d5de792b0a3b119da3b584eb64076ed192d050516f7d44a36f95ecd8cf32362
 md5=50dda4c865dba5c341422e2d848fb6be
 sha256=6d5de792b0a3b119da3b584eb64076ed192d050516f7d44a36f95ecd8cf32362
 
+[http://bitshrine.org/gpp/kernel-arm-2.6.27.8-lpc32xx.patch]
+md5=165364e207bd2e122d9f5e7d94a683eb
+sha256=897b6d576526c305b0e8b4a3d1cd02f334606429aacf4969094925cd321c5a3b
+
+[http://bitshrine.org/gpp/kernel-arm-2.6.27.8-lpc32xx_armtskit_update2.patch]
+md5=4074fe1f0af60b416e73ab4754dd59b3
+sha256=17c543853daed8f99d6a721a34c509aea262d6868d7680fe808971b401fe5761
+
+[http://bitshrine.org/gpp/kernel-arm-2.6.27.8-lpc32xx_ea3250.patch]
+md5=38af08bbd067ef50a9e09c64840e56db
+sha256=52cbdf4307c270a6396008a30c32c9012d155a7b0cf26a8430bda3632bee8f7d
+
+[http://bitshrine.org/gpp/kernel-arm-2.6.27.8-lpc32xx_update2.patch]
+md5=59f8fafa796bcbe6367c4f10ef8d9491
+sha256=96153e5b741c2ef4157c22aef9e1a6f1b91a796f3a646bdfb21bc3adbb4fe4b3
+
+[http://bitshrine.org/gpp/kernel-arm-2.6.27.8-lpc32xx_update3.patch]
+md5=2675cd2b70baad7ecc9fb5f64dc1854b
+sha256=b1528917ec3d9fc784173795838bf413761b15f5381b6c5885b27b96af418659
+
+[http://bitshrine.org/gpp/kernel-arm-2.6.27.8-lpc32xx_update4.patch]
+md5=2f21f8455945759a5af8060224f2a1e2
+sha256=14a15c6c8080189066d4e5914e365c5f0253a1578008ced42d7e32746e6f4666
+
+[http://bitshrine.org/gpp/kernel-arm-2.6.27.8-lpc32xx_update5.patch]
+md5=e65e51b0d8b5710a270fce38f1c6b05b
+sha256=2d323344b949de7ad5fb783136a1e6093d616f0a0fe5f7f79c4f1aa6c1869c6f
+
+[http://bitshrine.org/gpp/kernel-arm-2.6.27.8-update1.patch]
+md5=7533dc7dda4d8ff56dfa25b202632dff
+sha256=ff46bb7501f23c331b1ba6057ff2eab56690d9cb39a67f92ee7261bdd0947881
+
 [http://repository.maemo.org/pool/maemo3.1/free/source/kernel-source-rx-34_2.6.18-osso40.diff.gz]
 md5=4610c31506e86b81323ce45465ec73eb
 sha256=09e3fceea73bea972ce580232c5ca669836c892c6bfb303f8053463a2c534e93
@@ -16802,10 +16766,6 @@ sha256=774094746748fb0c8985210de0994accdc7095c222fba42c5623e2137443b6cd
 md5=d0fc91ccb9da401e9e40d2f4612bdac9
 sha256=774094746748fb0c8985210de0994accdc7095c222fba42c5623e2137443b6cd
 
-[http://www.libspf2.org/spf/libspf2-1.0.4.tar.gz]
-md5=5fe69ba13bf35d505b733247032a8a64
-sha256=222803a98d1e86ac7eee9491beb5fbf30e259a3c74cd4166bda1796374c26cd1
-
 [http://downloads.sourceforge.net/libspiff/libspiff-0.7.2.tar.bz2]
 md5=3b291762e0149c975dab9f5ea15bad15
 sha256=6b498c1070e17f665625dc3e5113e8af55da5ce3d4d5abf0ae3fec344b8208d4
@@ -17770,6 +17730,10 @@ sha256=8527c8a9b235a370db3aac606d9262f5e549ef202f114157b45f62564e3dd3bc
 md5=db323884c7dc46e4cd33d0d944fa59a9
 sha256=8e7075fc855ffbcf3c24cbd70b22791759224f98839886d50bba8d659193a950
 
+[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.27.8.tar.bz2]
+md5=cbdc1b350ef79dd323b9aeda5cf7f1b6
+sha256=330aa3059309c589c3abb2d743e5f391dac6671b75004dccde32b54ade17f05d
+
 [http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.27.tar.bz2]
 md5=b3e78977aa79d3754cb7f8143d7ddabd
 sha256=0e99bf9e83f4d1ae0c656741a84dfddfa9c4d2469cf35475f5939d02dc3e4393
@@ -19826,46 +19790,14 @@ sha256=2b0737b84e7b42c9e54c9658d23bfaee1189cd5955f26b10bdb862761d0f0432
 md5=09c8fa1058399a0c5db169a71561e985
 sha256=75c53f4b3017a9a8fcb9ff3bf7e2709a41a579b8a4e2ae1c600dc6ce6341cd31
 
-[ftp://ftp.osuosl.org/pub/mythtv/mythplugins-0.22rc1.tar.bz2]
-md5=1c03d3f4ccedcd9de1c0ac2226e0031c
-sha256=f62969cd61dc9718973708b79f5e86f653f630097f5ad14f90d78fcff677c0da
-
-[ftp://ftp.osuosl.org/pub/mythtv/mythplugins-0.22rc2.tar.bz2]
-md5=de15246c1f59665f3960015c49138da3
-sha256=73dff22a4622f2140b49ee824f1f69d6120135d828bc38f6877a619986c99245
-
 [ftp://ftp.osuosl.org/pub/mythtv/myththemes-0.22.tar.bz2]
 md5=a5f00f152fb430a20c70aaa3bf456347
 sha256=6720a16a0bdfb9bfb95bd729b50d95f75f8494b932a7dc44ad4014f06ecd36c2
 
-[ftp://ftp.osuosl.org/pub/mythtv/myththemes-0.22rc2.tar.bz2]
-md5=7d629aa8c0f1c8cdc11310b09a929626
-sha256=39494a9c05c47b9a28c6168211a5987a8386929a3210e637ed6191e3554ee9f6
-
-[http://www.mythtv.org/mc/mythtv-0.18.1.tar.bz2]
-md5=e6cabf88feeaf6ae8f830d3fdf7b113d
-sha256=86c9cf038d5d8a3fdf137ff735b55820281543a4a08e86cfad81a113a7b9a1d2
-
-[http://www.mythtv.org/mc/mythtv-0.20.tar.bz2]
-md5=52bec1e0fadf7d24d6dcac3f773ddf74
-sha256=777ff60afa89426f0e52e49b0e7a7661ddb45b59d2ebbfdcbe07fd179e526ff3
-
-[http://www.mythtv.org/mc/mythtv-0.21.tar.bz2]
-md5=49fc135e1cde90cd935c1229467fa37e
-sha256=33a878a8fc3efdd74519b09b4ec3d16fa9d3a0436b321c13344e5f3ab723c5e4
-
 [ftp://ftp.osuosl.org/pub/mythtv/mythtv-0.22.tar.bz2]
 md5=e8f8b5b6a51cd7be700e215b2a1bf2c0
 sha256=bb7212bac2cfc792c59a15a80caee8bbf469e250e6f48dc6b0856a60cb07b6fb
 
-[ftp://ftp.osuosl.org/pub/mythtv/mythtv-0.22rc1.tar.bz2]
-md5=049e93d78d5370351539c9a23b47e1af
-sha256=8e6823f4b92d88c837735322ca71199919406a2826bddae257c6e0f52d089cd7
-
-[ftp://ftp.osuosl.org/pub/mythtv/mythtv-0.22rc2.tar.bz2]
-md5=1e4be634b137e5b944c94b418d8c3791
-sha256=5cba470ccd60fec00be2bf7ef231f104dcea8275698fe70f5df398dbe2fe19fd
-
 [http://kldp.net/frs/download.php/3742/nabi-0.17.tar.gz]
 md5=8746890ea666ac1b7ae6db77993c6592
 sha256=1a239a7bb0644441ca781459fbf5a1c5fb95e823351bf308aa680eb60cc45b94
@@ -20186,6 +20118,10 @@ sha256=34316707a323b883f347b2566fd2dc7a3134b2bf432fb3a8b31d88829b0947e3
 md5=d90a997e3e2051ce8866fe24f765141f
 sha256=b22a90e6252d798b3889843910a016d185f9e87dd23e203003b1072013f670a6
 
+[http://ftp.gnome.org/pub/GNOME/sources/network-manager-applet/0.8/network-manager-applet-0.8.tar.bz2]
+md5=27071402152a7f8f62c4825f25ca9a3a
+sha256=6379e0acd3eadeb71e3ba2e3cf05d351caf6b794dff5777a5e86a591df603bd4
+
 [http://downloads.sourceforge.net/nfs/nfs-utils-1.0.6.tar.gz]
 md5=f17e9983457e1cf61c37f0be4493fce6
 sha256=aa99fcb016971290f9a871331eed60150ebdd84785dda1b252556a54760b97bf
@@ -22026,6 +21962,10 @@ sha256=916d7e1393ed09ca4c61b3c1ecb5f5564266c955db81ff587d2da8af7a7abaab
 md5=b8c118d4360846829beb30b02a6b91a7
 sha256=e15d499321e003d12ed183601e37ee7ba5f64b278d1de30149ce01bd4a3f234d
 
+[http://ftp.funet.fi/pub/CPAN/src/5.0/perl-5.8.8.tar.gz]
+md5=b8c118d4360846829beb30b02a6b91a7
+sha256=e15d499321e003d12ed183601e37ee7ba5f64b278d1de30149ce01bd4a3f234d
+
 [http://ftp.funet.fi/pub/CPAN/src/perl-5.8.8.tar.gz]
 md5=b8c118d4360846829beb30b02a6b91a7
 sha256=e15d499321e003d12ed183601e37ee7ba5f64b278d1de30149ce01bd4a3f234d
@@ -22258,14 +22198,6 @@ sha256=b216936e6e011b58fefee8e3f80d01008cb078b7fe2a5632b2ce98bc7bcb05c2
 md5=2fd9fe103375dbd0c91af2f302250a8c
 sha256=e2174f1249ea79121648bb0e9353729767654e6d430fb2d28da342ec25a179be
 
-[http://downloads.sourceforge.net/pmt/pngcrush-1.6.4.tar.gz]
-md5=a329caad3f49ed3ca105e6fd441f5b93
-sha256=22ffea3aed00da9a9518a9c25b619d212bbe27b9ec72165cf74640f930108b2f
-
-[http://heanet.dl.sourceforge.net/pmt/pngcrush-1.6.4.tar.gz]
-md5=a329caad3f49ed3ca105e6fd441f5b93
-sha256=22ffea3aed00da9a9518a9c25b619d212bbe27b9ec72165cf74640f930108b2f
-
 [http://downloads.sourceforge.net/gakusei/pobox-1.2.5.tar.bz2]
 md5=d1c988c2ac06d3111f80d59d30bb8bbb
 sha256=73bbc333d2a51d0e1cd73030012f2727ac26f5b1d41333994b01a47486fc16db
@@ -22310,6 +22242,14 @@ sha256=d978d3cb4ec99187309b906a636312827c8fef091df28ba9d7e07a5014017c0a
 md5=1fb488c4061256197a667f1c480ffc33
 sha256=48a5aabb873d4cc654c95acf6576868d7a8a3ee97e1c6418e1d716698b6efa76
 
+[http://hal.freedesktop.org/releases/polkit-0.96.tar.gz]
+md5=e0a06da501b04ed3bab986a9df5b5aa2
+sha256=3426ca917210b2a5525732559368c18f983a4c39a6a55c5dddba26071bd8054a
+
+[http://hal.freedesktop.org/releases/polkit-gnome-0.96.tar.bz2]
+md5=611cf39fba2945320fc7a9ec49087e69
+sha256=0d96c8032d658a2e1eef8adfbeafff0f569ef0cf68b35915423acc00873c8a92
+
 [http://www.rpsys.net/openzaurus/patches/archive/poodle_asoc_fix-r1.patch]
 md5=7c766563674dec668baa5f650a14b7cd
 sha256=3f78e714248cdaa0b83f530a3b7f80da02446b179e86fbb043d57c3e05ae0d7e
@@ -23794,6 +23734,10 @@ sha256=55259c813324f6383cbd441aa2f23e01c320b6d63fbe3b5d52a7715055d28589
 md5=0542a4be6425451ab5f668c6899cac36
 sha256=4c84b39b8a2546854ce9c0c9f761dd55da76dab2c33eeb876e3d17db1d2ea0c5
 
+[ftp://ftp.trolltech.com/qt/source/qt-everywhere-opensource-src-4.6.2.tar.gz]
+md5=eb651ee4b157c01696aa56777fc6e0e5
+sha256=176f51ddb06dce67ab4b2efc6b327dc21ed8f764c5d97acc15ff1f907c2affae
+
 [ftp://ftp.trolltech.com/qt/source/qt-x11-free-3.3.5.tar.bz2]
 md5=05d04688c0c0230ed54e89102d689ca4
 sha256=aac89e862c74b2f3ead768e50e9fa7ada1e4225fe9d1d9e05723a3279259eb96
@@ -25286,6 +25230,10 @@ sha256=b2097320a1fca4851f1377a14f4cc14a46e27d2a44ca017c40a6cb618b2f31e8
 md5=a282846532ecbd6b4a28072373b3a70b
 sha256=b2097320a1fca4851f1377a14f4cc14a46e27d2a44ca017c40a6cb618b2f31e8
 
+[http://downloads.sourceforge.net/smartmontools/smartmontools-5.39.1.tar.gz]
+md5=f6f7380ae45587161c0adae8862110e9
+sha256=725cfd59b33a97561346a990e1ec50b150dbac01f2b90cd9cf3fd74ff1e77720
+
 [http://xorg.freedesktop.org/releases/individual/app/smproxy-1.0.2.tar.bz2]
 md5=31da204a0255ba8c6a65386e65dc1c90
 sha256=76d22f0cf07c8c4386a15c5c935b58319bd747befb940a0f03f652d59c4f67d2
@@ -26174,6 +26122,10 @@ sha256=7f56dd08cf5425218b697d5db82e6ce03aff4f7b57f58d3053f0a7af632b3747
 md5=2aecff382af4d8ba7fcd69298cc79413
 sha256=c1f5746d22ef439ee47c9b012273ccbefbb2621075f05876bdb6ad5cfe4e1bbe
 
+[http://ftp.gnome.org/pub/GNOME/sources/system-tools-backends/2.8/system-tools-backends-2.8.3.tar.bz2]
+md5=403bf4b7c82455d995d6aa54613246c2
+sha256=67629bb6502a4c5b8b639867deb40ecabd5676a4655c264c1f0dbeb97de5c98c
+
 [ftp://ftp.cistron.nl/pub/people/miquels/sysvinit/sysvinit-2.86.tar.gz]
 md5=7d5d61c026122ab791ac04c8a84db967
 sha256=035f98fae17d9cff002993c564ccc83dc4ed136127172caeff872b6abdb679d8
@@ -26550,10 +26502,6 @@ sha256=96309871519efcab829fdfcc1cca546d772ed6a0e214c9e99e77ca7aea29f734
 md5=d06e2dcef6ac6c975311e88083d8ef26
 sha256=f30ffe64bcf4fc8a82a76594c254ce54c82a33d797cdc0f35f19519572f94c4a
 
-[http://stgt.berlios.de/releases/tgt-1.0.0.tar.bz2]
-md5=71f828ef455bdc0066ed087f9547530c
-sha256=0f0d82f50d12c41f1e277bb72e99bf86f02a4258d7595eb886ac554b09a67a33
-
 [http://packetstorm.linuxsecurity.com/groups/thc/thcrut-1.2.5.tar.gz]
 md5=190f08ce6839aecb0fa0ce8d5ddd09ee
 sha256=b32f3d71ac540248b7643baa39d8ecfb75af493228caaeb64608e49f2f092473
@@ -27074,6 +27022,10 @@ sha256=ee9000a0276675ed697f8d404edf80104fd338c3fb979907e4ee63ca83d65e5e
 md5=3cd8038d7bbfb3a4ac544aceef724853
 sha256=ee9000a0276675ed697f8d404edf80104fd338c3fb979907e4ee63ca83d65e5e
 
+[http://ftp.uni-erlangen.de/pub/Linux/MIRROR.gentoo/distfiles/tzdata2010b.tar.gz]
+md5=dfd29a56cb39cc8c57b0939608a054f6
+sha256=a93208ae389cc0d3618731cc9f406ba2cfc6aac39668a06c687d3fae2a7e8210
+
 [ftp://ftp.pl.debian.org/pub/debian/pool/main/t/tzdata/tzdata_2007h.orig.tar.gz]
 md5=8b766bb807c1f7c0c02ff798ea5db80e
 sha256=b4c6367ab85de8f148c903bb25dc69de7a7d7d05f204f58880a16a8b81bf93de
@@ -27258,6 +27210,10 @@ sha256=ee3922bd46dbdc406be5d498be5bc062a0b39f05f1c0a1b22c3657eb0e805975
 md5=86382b7bbc64459e714c65a2a4e10916
 sha256=001be4a8963c48e7debc82c6078562d087a2979da63e558a5e3613c03725c377
 
+[http://kernel.org/pub/linux/utils/kernel/hotplug/udev-151.tar.gz]
+md5=5e66b90bfa91e9ed101fdb66735af658
+sha256=a1fbc567ab6c2062ce32cebe6c96664282a979e0b7bf402b16fb3795c9ac0ae8
+
 [http://udhcp.busybox.net/source/udhcp-0.9.8.tar.gz]
 md5=2d7e548820d2ded5e183933cb701defb
 sha256=da0ca1e821e3fa7cfbe73ddb1480b921002ee992f5e5fbc611422c103b907443
@@ -27718,6 +27674,10 @@ sha256=d4a055b0eb714d5335e21db8d685f27a59f2f7b639bf8229429e6e9325928674
 md5=f1d2d0c254b97ac298283d795dc88625
 sha256=2bd7bfc71e56f2d29a0c971a81e7ff098a96d0e79d68eed0d604f3882ccd6fe6
 
+[http://www.freesmartphone.org/sources/vala-0.7.10.3.tar.bz2]
+md5=b3b2b025c46f66a887bca195f44ea46a
+sha256=de4fe0a55fd6dcff31205fbf81766593bb9e576939ebe3dd418967cde15b70c4
+
 [http://www.freesmartphone.org/sources/vala-0.7.10.tar.bz2]
 md5=6e807644f500d6605a5ee4e1612dd187
 sha256=902392d95e20e8c3e18ad739e24c6727dd90fe281b1ffdbbf509a8d7c50aa8c5
@@ -28338,10 +28298,6 @@ sha256=c6f692956d93765f12402a0b22617566decc52a9bb1a707b4e8d12affd1528d3
 md5=3d35c181dfab7dfd3fe898738dffb421
 sha256=64e6bd25d18e838e1c60693eccbd11926c65b228d6ac69c4dafc7ebe7341dbbf
 
-[http://downloads.sourceforge.net/witty/wt-3.0.0.tar.gz]
-md5=ba03acf8089dff38e106661aa1ecdcb9
-sha256=d439e96d2de8c22f682b5d3d5894974d50b3a36057a002bda1ad1cb858cd3b28
-
 [http://downloads.sourceforge.net/wvware/wv-1.2.0.tar.gz]
 md5=b6319d5e75611fe2210453b5feb82c0c
 sha256=a76f44468e78591e6d510d326702e7c3999d2b9dd3ab8ab8c1c9811fd5b111e4
@@ -28394,6 +28350,10 @@ sha256=8fa45a6bfe4d6ac3d9a457543844873090d0c7da817991ac0cd547732f475a14
 md5=50208b5c8d5c125accd18f9760225f9e
 sha256=6b134ac08daf1186c1cdd34fea4ad8c4f1ad2f52307db98786e262dc4243256c
 
+[http://www.gedanken.demon.co.uk/download-wwwoffle/wwwoffle-2.9f.tgz]
+md5=a5f04c190a2f27f28cfc744c478e6aaa
+sha256=14728356373c57dbafeaa8458455f1a299aee7ab395cb0de0312be5d693f7b5a
+
 [http://biolpc22.york.ac.uk/pub/CVS_HEAD/v1/wx-cvs-Gtk.tar.bz2]
 md5=cac58d215b73189e8574d1c361e771a6
 sha256=1e09f6ad9dd987403f9549c2640680cf932ba00df5afa20a4531e98544b413a5
@@ -30834,7 +30794,11 @@ sha256=b308ddc96fcb27b3f18ed2fa20aeb3a12fb73cec7676d75914a58d1b27124b83
 md5=88352816c84cbea57121b0c478976976
 sha256=1d8ab1354c73935a5d12f0d7d226d26ae1b90fdd235460bdb57fd5651229bc8b
 
-[http://www.us.xfce.org/archive/xfce/4.4.2/src/xfce4-session-4.4.2.tar.bz2]
+[http://archive.xfce.org/src/apps/xfce4-power-manager/0.8/xfce4-power-manager-0.8.4.2.tar.bz2]
+md5=3131257750766838a64a9bb7f74eb2a1
+sha256=16cc04bf613ecfbc9ea43514ccb5f7d7923b7fc4ebf8117c0ce32fa1422334e1
+
+[http://www.us.xfce.org/archive/xfce-4.4.2/src/xfce4-session-4.4.2.tar.bz2]
 md5=4c3d1acb8ce37ea4dd55d82aeb38e9e7
 sha256=7394906dec7b50789407219f85143ae83b10938949d38adeecdd59eb50c8c1c6
 
diff --git a/conf/collections.inc b/conf/collections.inc
index 831ca935e6..6a0f41fd78 100644
--- a/conf/collections.inc
+++ b/conf/collections.inc
@@ -166,7 +166,9 @@ def collections_setup(d):
         import sys
         bb.debug(1, "Re-executing bitbake with BBPATH of %s" % d.getVar("BBPATH", 0))
         os.environ["BBPATH"] = d.getVar("BBPATH", 0)
-        os.environ["PYTHONPATH"] = ":".join(sys.path)
+        # FIXME: This exports a bogus PYTHONPATH to OE recipes resulting in massive breakages: 
+        # http://thread.gmane.org/gmane.comp.handhelds.openembedded/30163
+        # os.environ["PYTHONPATH"] = ":".join(sys.path)
         sys.argv.insert(0, sys.executable)
         os.execvpe(sys.executable, sys.argv, os.environ)
 
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index 5f9e333046..04e028e488 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -1,11 +1,11 @@
-ANGSTROM_QT_VERSION ?= "4.6.0"
+ANGSTROM_QT_VERSION ?= "4.6.2"
 
 PREFERRED_VERSION_autoconf = "2.63"
 PREFERRED_VERSION_autoconf-native = "2.63"
 PREFERRED_VERSION_automake-native = "1.10.2"
 PREFERRED_VERSION_busybox 	= "1.13.2"
-PREFERRED_VERSION_cairo		= "1.8.8"
-PREFERRED_VERSION_dbus 		= "1.2.3"
+PREFERRED_VERSION_cairo		= "1.8.10"
+PREFERRED_VERSION_dbus 		= "1.2.20"
 PREFERRED_VERSION_dropbear      = "0.51"
 PREFERRED_VERSION_fontconfig	= "2.6.0"
 PREFERRED_VERSION_glib-2.0 	= "2.22.4"
@@ -27,7 +27,10 @@ PREFERRED_VERSION_mesa          = "7.6"
 PREFERRED_VERSION_mesa-dri      = "7.6"
 PREFERRED_VERSION_mesa-xlib     = "7.6"
 PREFERRED_VERSION_mplayer       = "0.0+1.0rc3+svnr30165"
+PREFERRED_VERSION_network-manager-applet = "0.8"
+PREFERRED_VERSION_networkmanager = "0.8"
 PREFERRED_VERSION_pango 	= "1.24.4"
+PREFERRED_VERSION_pango-native     = "1.24.4"
 #PREFERRED_VERSION_pixman	= "0.13.2"
 PREFERRED_VERSION_pkgconfig	= "0.23"
 PREFERRED_VERSION_pkgconfig-native = "0.23"
@@ -43,10 +46,10 @@ PREFERRED_VERSION_qt4-x11-free-gles = "${ANGSTROM_QT_VERSION}"
 PREFERRED_VERSION_samba		= "3.3.9"
 PREFERRED_VERSION_tiff 		= "3.8.2+4.0.0beta2"
 
-PREFERRED_VERSION_udev 		= "141"
+PREFERRED_VERSION_udev 		= "151"
 UDEV_GE_141 = "1"
 
-PREFERRED_VERSION_usbutils = "0.82"
+PREFERRED_VERSION_usbutils = "0.86"
 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 fda3cd4729..cd258640fb 100644
--- a/conf/distro/include/fso-autorev.inc
+++ b/conf/distro/include/fso-autorev.inc
@@ -13,17 +13,14 @@ 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}"
 SRCREV_pn-fso-gpsd = "${AUTOREV}"
 SRCREV_pn-fso-monitord = "${AUTOREV}"
 SRCREV_pn-fso-sounds = "${AUTOREV}"
 SRCREV_pn-fso-specs = "${AUTOREV}"
-SRCREV_pn-fso-term = "${AUTOREV}"
 SRCREV_pn-gsmd2 = "${AUTOREV}"
 SRCREV_pn-illume-theme-freesmartphone = "${AUTOREV}"
 SRCREV_pn-libascenario = "${AUTOREV}"
-SRCREV_pn-libeflvala = "${AUTOREV}"
 SRCREV_pn-libfsobasics = "${AUTOREV}"
 SRCREV_pn-libfsoframework = "${AUTOREV}"
 SRCREV_pn-libfsoresource = "${AUTOREV}"
@@ -34,13 +31,17 @@ SRCREV_pn-libgee-native = "${AUTOREV}"
 SRCREV_pn-libgee = "${AUTOREV}"
 SRCREV_pn-libgsm0710 = "${AUTOREV}"
 SRCREV_pn-libgsm0710mux = "${AUTOREV}"
+SRCREV_pn-libmsmcomm = "${AUTOREV}"
 SRCREV_pn-libpersistence = "${AUTOREV}"
-SRCREV_pn-mickeydbus = "${AUTOREV}"
+SRCREV_pn-mdbus = "${AUTOREV}"
+SRCREV_pn-mdbus2 = "${AUTOREV}"
 SRCREV_pn-mickeyterm = "${AUTOREV}"
+SRCREV_pn-mterm2 = "${AUTOREV}"
 SRCREV_pn-misc-vapi = "${AUTOREV}"
 SRCREV_pn-msmcommd = "${AUTOREV}"
 SRCREV_pn-python-pytrc = "${AUTOREV}"
 SRCREV_pn-vala-dbus-binding-tool-native = "${AUTOREV}"
+SRCREV_pn-vala-dbus-binding-tool = "${AUTOREV}"
 SRCREV_pn-vala-native = "${AUTOREV}"
 SRCREV_pn-vala = "${AUTOREV}"
 SRCREV_pn-zhone = "${AUTOREV}"
diff --git a/conf/distro/include/kaeilos-2009-preferred-versions.inc b/conf/distro/include/kaeilos-2009-preferred-versions.inc
index 870ac04036..e8a0ca3e95 100644
--- a/conf/distro/include/kaeilos-2009-preferred-versions.inc
+++ b/conf/distro/include/kaeilos-2009-preferred-versions.inc
@@ -18,27 +18,29 @@ 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_glproto	= "1.4.9"
 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_network-manager-applet = "0.7.999+git"
+PREFERRED_VERSION_networkmanager = "0.7.999"
 PREFERRED_VERSION_pango 	= "1.24.4"
-PREFERRED_VERSION_pixman	= "0.16.2"
+#PREFERRED_VERSION_pixman	= "0.13.2"
 PREFERRED_VERSION_pkgconfig	= "0.23"
 PREFERRED_VERSION_pkgconfig-native = "0.23"
 PREFERRED_VERSION_pulseaudio 	= "0.9.15"
@@ -49,7 +51,7 @@ 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"
+KAEILOS_QT_VERSION ?= "4.6.2"
 PREFERRED_VERSION_qt4-tools-native = "${KAEILOS_QT_VERSION}"
 PREFERRED_VERSION_qt4-tools-sdk = "${KAEILOS_QT_VERSION}"
 PREFERRED_VERSION_qt4-embedded = "${KAEILOS_QT_VERSION}"
@@ -57,19 +59,14 @@ PREFERRED_VERSION_qt4-embedded-gles = "${KAEILOS_QT_VERSION}"
 PREFERRED_VERSION_qt4-x11-free = "${KAEILOS_QT_VERSION}"
 PREFERRED_VERSION_qt4-x11-free-gles = "${KAEILOS_QT_VERSION}"
 
-PREFERRED_VERSION_udev 		= "141"
+PREFERRED_VERSION_udev 		= "151"
 UDEV_GE_141 = "1"
 
-PREFERRED_VERSION_usbutils = "0.82"
+PREFERRED_VERSION_usbutils = "0.86"
 PREFERRED_VERSION_wpa-supplicant = "0.6.9"
+PREFERRED_VERSION_xserver-common = "1.32"
 PREFERRED_VERSION_xserver-kdrive = "1.4.0.90"
 
-# Use latest version available
-#PREFERRED_VERSION_util-macros-native = "1.4.1"
-#PREFERRED_VERSION_util-macros = "1.4.1"
-#PREFERRED_VERSION_xserver-xorg = "1.7.3"
-#PREFERRED_VERSION_xf86-video-xgi = "1.5.1"
-
 #
 # meta-moblin package SRCREVs
 #
diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc
index f1d16d3b4d..703fa65b37 100644
--- a/conf/distro/include/preferred-shr-versions.inc
+++ b/conf/distro/include/preferred-shr-versions.inc
@@ -7,6 +7,7 @@ PREFERRED_VERSION_autoconf-native = "2.63"
 PREFERRED_VERSION_libmikmod = "3.2.0-beta2"
 PREFERRED_VERSION_mtd-utils-native = "1.2.0+git"
 PREFERRED_VERSION_strace = "4.5.15"
+PREFERRED_VERSION_mesa-dri     = "7.7.999"
 
 # We need this for jamvm
 PREFERRED_VERSION_classpath = "0.98"
@@ -32,14 +33,14 @@ 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_udev          = "151"
+PREFERRED_VERSION_usbutils      = "0.86"
 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"
+ANGSTROM_QT_VERSION ?= "4.6.2"
 PREFERRED_VERSION_qt4-tools-native = "${ANGSTROM_QT_VERSION}"
 PREFERRED_VERSION_qt4-tools-sdk = "${ANGSTROM_QT_VERSION}"
 PREFERRED_VERSION_qt4-embedded = "${ANGSTROM_QT_VERSION}"
@@ -47,6 +48,8 @@ PREFERRED_VERSION_qt4-embedded-gles = "${ANGSTROM_QT_VERSION}"
 PREFERRED_VERSION_qt4-x11-free = "${ANGSTROM_QT_VERSION}"
 PREFERRED_VERSION_qt4-x11-free-gles = "${ANGSTROM_QT_VERSION}"
 
+# epdf needs > 0.12, but recipes have D_P = -1
+PREFERRED_VERSION_poppler = "0.12.3"
 
 # Downgraded
 PREFERRED_VERSION_pulseaudio = "0.9.15"
diff --git a/conf/distro/include/preferred-xorg-versions-live.inc b/conf/distro/include/preferred-xorg-versions-live.inc
index 65e94fac5c..8c04925f65 100644
--- a/conf/distro/include/preferred-xorg-versions-live.inc
+++ b/conf/distro/include/preferred-xorg-versions-live.inc
@@ -1,4 +1,4 @@
-#Mon Jan 18 14:00:56 CET 2010
+#Thu Feb 25 10:36:35 CET 2010
 #app
 PREFERRED_VERSION_appres ?= "1.0.2"
 PREFERRED_VERSION_bdftopcf ?= "1.0.2"
@@ -14,7 +14,7 @@ PREFERRED_VERSION_iceauth ?= "1.0.3"
 PREFERRED_VERSION_ico ?= "1.0.2"
 PREFERRED_VERSION_lbxproxy ?= "1.0.2"
 PREFERRED_VERSION_listres ?= "1.0.2"
-PREFERRED_VERSION_luit ?= "1.0.4"
+PREFERRED_VERSION_luit ?= "1.0.5"
 PREFERRED_VERSION_mkcfm ?= "1.0.1"
 PREFERRED_VERSION_mkcomposecache ?= "1.2.1"
 PREFERRED_VERSION_mkfontdir ?= "1.0.5"
@@ -78,7 +78,7 @@ PREFERRED_VERSION_xlsclients ?= "1.0.2"
 PREFERRED_VERSION_xlsfonts ?= "1.0.2"
 PREFERRED_VERSION_xmag ?= "1.0.3"
 PREFERRED_VERSION_xman ?= "1.1.0"
-PREFERRED_VERSION_xmessage ?= "1.0.2"
+PREFERRED_VERSION_xmessage ?= "1.0.3"
 PREFERRED_VERSION_xmh ?= "1.0.1"
 PREFERRED_VERSION_xmodmap ?= "1.0.4"
 PREFERRED_VERSION_xmore ?= "1.0.1"
@@ -138,7 +138,7 @@ PREFERRED_VERSION_xf86-input-summa ?= "1.2.0"
 PREFERRED_VERSION_xf86-input-synaptics ?= "1.2.1"
 PREFERRED_VERSION_xf86-input-tek4957 ?= "1.2.0"
 PREFERRED_VERSION_xf86-input-ur98 ?= "1.1.0"
-PREFERRED_VERSION_xf86-input-vmmouse ?= "12.6.5"
+PREFERRED_VERSION_xf86-input-vmmouse ?= "12.6.6"
 PREFERRED_VERSION_xf86-input-void ?= "1.3.0"
 PREFERRED_VERSION_xf86-video-apm ?= "1.2.2"
 PREFERRED_VERSION_xf86-video-ark ?= "0.7.2"
@@ -149,7 +149,7 @@ PREFERRED_VERSION_xf86-video-cirrus ?= "1.3.2"
 PREFERRED_VERSION_xf86-video-cyrix ?= "1.1.0"
 PREFERRED_VERSION_xf86-video-dummy ?= "0.3.3"
 PREFERRED_VERSION_xf86-video-fbdev ?= "0.4.1"
-PREFERRED_VERSION_xf86-video-geode ?= "2.11.6"
+PREFERRED_VERSION_xf86-video-geode ?= "2.11.7"
 PREFERRED_VERSION_xf86-video-glint ?= "1.2.4"
 PREFERRED_VERSION_xf86-video-i128 ?= "1.3.3"
 PREFERRED_VERSION_xf86-video-i740 ?= "1.3.2"
@@ -292,7 +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.4"
+PREFERRED_VERSION_pixman ?= "0.17.8"
 PREFERRED_VERSION_xtrans ?= "1.2.5"
 PREFERRED_VERSION_xtrans-native ?= "1.2.5"
 #proto
@@ -302,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.2"
+PREFERRED_VERSION_dri2proto ?= "2.3"
 PREFERRED_VERSION_evieext ?= "1.1.0"
 PREFERRED_VERSION_fixesproto ?= "4.1.1"
 PREFERRED_VERSION_fixesproto-native ?= "4.1.1"
@@ -346,9 +346,8 @@ 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.5.0"
-PREFERRED_VERSION_util-macros-native ?= "1.5.0"
+PREFERRED_VERSION_util-macros ?= "1.6.0"
+PREFERRED_VERSION_util-macros-native ?= "1.6.0"
 PREFERRED_VERSION_xorg-cf-files ?= "1.0.3"
 #xserver
-#PREFERRED_VERSION_xserver-xorg ?= "1.7.99.2"
-PREFERRED_VERSION_xserver-xorg ?= "1.7.4"
+PREFERRED_VERSION_xserver-xorg ?= "1.7.999"
diff --git a/conf/distro/include/sane-srcrevs-fso.inc b/conf/distro/include/sane-srcrevs-fso.inc
index 2178ab3c3e..25b78af7b4 100644
--- a/conf/distro/include/sane-srcrevs-fso.inc
+++ b/conf/distro/include/sane-srcrevs-fso.inc
@@ -1,12 +1,12 @@
 # To be included from sane-srcrevs.inc
 
 # FSO Projects -- Cornucopia
-FSO_CORNUCOPIA_SRCREV ?= "429a3d190016b7516b57703faa777c398d843d6c"
+FSO_CORNUCOPIA_SRCREV ?= "db31bb641fcc8516f201686843cf2551d963be38"
 SRCREV_pn-fso-apm ?= "${FSO_CORNUCOPIA_SRCREV}"
-SRCREV_pn-fso-boot ?= "241e9212db9f22d3cb0491723a1c41309f4bf486"
+SRCREV_pn-fso-boot ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-fsodatad ?= "${FSO_CORNUCOPIA_SRCREV}"
-SRCREV_pn-fsodeviced ?= "c5094450745643b1b4410a79d7cb72e3f7df28a6"
-SRCREV_pn-fsogsmd ?= "42b94a43ef1dce1225c1f26301c0f4b8aab669e8"
+SRCREV_pn-fsodeviced ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-fsogsmd ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-fsolocationd ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-fsomusicd ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-fsonetworkd ?= "${FSO_CORNUCOPIA_SRCREV}"
@@ -15,35 +15,36 @@ SRCREV_pn-fsotdld ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-fsousaged ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-libfsobasics ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-libfsoframework ?= "${FSO_CORNUCOPIA_SRCREV}"
-SRCREV_pn-libfsotransport ?= "0c1e8c057b4110b1d8d2c24fd93744c03c304cc8"
+SRCREV_pn-libfsotransport ?= "${FSO_CORNUCOPIA_SRCREV}"
 SRCREV_pn-libfsoresource ?= "${FSO_CORNUCOPIA_SRCREV}"
-SRCREV_pn-mickeydbus2 ?= "3e75d0ab3e334e303fa1f64b5d87465150c0b58c"
+SRCREV_pn-mdbus2 ?= "${FSO_CORNUCOPIA_SRCREV}"
+SRCREV_pn-mterm2 ?= "${FSO_CORNUCOPIA_SRCREV}"
 
 # FSO Projects -- Misc
 SRCREV_pn-dbus-hlid ?= "5df7f49fe8881804aaab544a569fd164c3e93afb"
-SRCREV_pn-frameworkd ?= "e3d6339c5d69e0791c4633f86363159e56126075"
+SRCREV_pn-frameworkd ?= "f9240762be27356f66bd7bc0b5526dfdb9412491"
 SRCREV_pn-frameworkd-config-shr_FSO_REV ?= ${SRCREV_pn-frameworkd}
-SRCREV_pn-fso-abyss ?= "aaa3c48296c8589d845f2b6e4314b794750d91cc"
-SRCREV_pn-fso-term ?= "aa0b9c26dee3918a5e9d2809bb36335bda276a0d"
+SRCREV_pn-fso-abyss ?= "b13b3b31975d5c921326d38a528627cff53b8bb9"
 SRCREV_pn-fso-gpsd ?= "39e810899110a9bb302cf2064e1c0f73541fb4e6"
-SRCREV_pn-fso-gsm0710muxd ?= "abcbcd7cc532a8834906de3fc24c8f8fe7643cd4"
+SRCREV_pn-fso-gsm0710muxd ?= "1d69fb5b666ac2a9e54e46978c7afa8fe5dfc3c9"
 SRCREV_pn-fso-monitord ?= "b4ae1e9b10e710042624c2cf1a15b91a7d5b1d44"
 SRCREV_pn-fso-sounds ?= "3a4767ec01988bd0fd8f72f0c35d6d36e5fbc815"
-SRCREV_pn-fso-specs ?= "af3e18e5183ccce29a03eea9fc5f5a0098003cc6"
+SRCREV_pn-fso-specs ?= "a0b55a3b5337a5fc486199491e69e28849a80c67"
 SRCREV_pn-gsmd2 ?= "c16883a079aeff8780e5d461ec4e8348537ab4d8"
-SRCREV_pn-libfso-glib ?= "d7d9045b806744bdedf409874009cfde16c2de39"
-SRCREV_pn-libframeworkd-glib ?= "e99e5eff088f8a7513852300c3001a5b5cafec24"
-SRCREV_pn-libgsm0710 ?= "cd564c8782f018e0d65fb8716c99a6040b5bd166"
-SRCREV_pn-libgsm0710mux ?= "7934196c47eb80e77105a92cb684656b3614a9fc"
+SRCREV_pn-libfso-glib ?= "44b989273e0a86d5bae19588bd1dfcf32c79cdb7"
+SRCREV_pn-libframeworkd-glib ?= "be8b61dfe595c19abfaca3f308038ae70195f720"
+SRCREV_pn-libgsm0710 ?= "52eea64bdbb79c09002b46e98a5e656509884f72"
+SRCREV_pn-libgsm0710mux ?= "18aeee32980656a2c1ab6fd4b6438bd8dd57eadc"
 SRCREV_pn-libpersistence ?= "217ad803745f8ac1f3c72c6715e2c0faefb3fd06"
 FSO_PYTHONHELPERS_SRCREV ?= "63b1dff1bc8ac22efabcee8a90e957c3b2423317"
-SRCREV_pn-mickeydbus ?= "${FSO_PYTHONHELPERS_SRCREV}"
+SRCREV_pn-mdbus ?= "${FSO_PYTHONHELPERS_SRCREV}"
 SRCREV_pn-mickeyterm ?= "${FSO_PYTHONHELPERS_SRCREV}"
-SRCREV_pn-msmcommd ?= "072226ac1e0f21735cb3bc26cdb87cd87e347afb"
+SRCREV_pn-msmcommd ?= "3f2e0e2326cf94348abab94c9773cf418989f3c0"
 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 ?= "8df9b5aab50066d3f5a525518f902dd26f77bbd7"
-SRCREV_pn-vala-terminal ?= "932285d72e26b965c488f8aa99fe51f7a34231ad"
-SRCREV_pn-vala-native ?= "a8aa50a80bcdc5f6c8183507f87b6c6fdfac8d9f"
-SRCREV_pn-zhone ?= "2638381cf581d167cf5304baf64ae678016428a6"
+SRCREV_pn-vala-dbus-binding-tool-native ?= "0dda9a5d7f895d67c6a778f559e929ace229e42b"
+SRCREV_pn-vala-dbus-binding-tool ?= "0dda9a5d7f895d67c6a778f559e929ace229e42b"
+SRCREV_pn-vala-terminal ?= "fda5f26710acfc0befe04c8f2e58b35bdba297f7"
+SRCREV_pn-vala-native ?= "e98c5df3db6d47f0e2462e294be63fc8385c5916"
+SRCREV_pn-zhone ?= "bd1e895f73a0e5beb2608ebe111d7ef32ee3adbc"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 1e007f6219..d7677e54fc 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -51,14 +51,12 @@ SRCREV_pn-e-wm-illume-dict-pl ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
 SRCREV_pn-e-wm-menu-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
 SRCREV_pn-e-wm-sysactions-shr ?= "bbcec18f0ebd47e4f6eea88b9b774edf7400e752"
 SRCREV_pn-e-wm-theme-illume-gry ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
-SRCREV_pn-e-wm-theme-illume-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
 SRCREV_pn-e-wm-theme-illume-niebiee ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
 SRCREV_pn-e-wm-theme-illume-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
 SRCREV_pn-e-wm-theme-illume-sixteen ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
 SRCREV_pn-ebrainy ?= "21"
 SRCREV_pn-eds-dbus ?= "736"
 SRCREV_pn-elementary-theme-gry ?= "2ac643cc273d144bb731a8cbb8ec6b3615de43a0"
-SRCREV_pn-elementary-theme-neo ?= "2ac643cc273d144bb731a8cbb8ec6b3615de43a0"
 SRCREV_pn-elementary-theme-niebiee ?= "2ac643cc273d144bb731a8cbb8ec6b3615de43a0"
 SRCREV_pn-elementary-theme-sixteen ?= "2ac643cc273d144bb731a8cbb8ec6b3615de43a0"
 SRCREV_pn-elf2flt ?= "1786"
@@ -68,14 +66,12 @@ SRCREV_pn-enotes ?= "19"
 SRCREV_pn-epdfview ?= "346"
 SRCREV_pn-epiphany ?= "7837"
 SRCREV_pn-essential-dialer ?= "194"
-SRCREV_pn-etk-theme-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
 SRCREV_pn-etk-theme-ninja ?= "5"
 SRCREV_pn-etk-theme-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
 SRCREV_pn-ezx-boot-usb-native ?= "2371"
 SRCREV_pn-ezx-gen-blob ?= "2426"
 SRCREV_pn-ezxd ?= "2074"
 SRCREV_pn-fbgrab-viewer-native ?= "1943"
-SRCREV_pn-ffalarms ?= "67"
 SRCREV_pn-flashrom ?= "3682"
 SRCREV_pn-fltk2 ?= "6916"
 SRCREV_pn-frameworkd-config-shr ?= "ec04ab4bc92f9d4c4e398df9a2ee1330e3660373"
@@ -93,14 +89,11 @@ SRCREV_pn-gpe-contacts ?= "9312"
 SRCREV_pn-gpe-gallery ?= "9376"
 SRCREV_pn-gpe-mini-browser2 ?= "9900"
 SRCREV_pn-gpe-sketchbook ?= "9547"
-SRCREV_pn-gpe-theme-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
 SRCREV_pn-gridpad ?= "194"
-SRCREV_pn-gtk-theme-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
 SRCREV_pn-gtkhtml2 ?= "1158"
 SRCREV_pn-guitartune ?= "11"
 SRCREV_pn-gypsy ?= "134"
 SRCREV_pn-hildon-1 ?= "14429"
-SRCREV_pn-icon-theme-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
 SRCREV_pn-illume-keyboards-shr ?= "7bcdd55dc0cf6f3b50fd0226345592f538301b8a"
 SRCREV_pn-illume-theme-asu ?= "4881"
 SRCREV_pn-illume-theme-freesmartphone ?= "b1b0f6adc59e6f72a3929771058e3750bf181bc5"
@@ -110,14 +103,11 @@ SRCREV_pn-intuition ?= "194"
 SRCREV_pn-kismet ?= "2285"
 SRCREV_pn-kismet-newcore ?= "2285"
 SRCREV_pn-libcalenabler2 ?= "1410"
-SRCREV_pn-libdrm ?= "89cc98c0d5c1b43a883f13210c472339dde1a4cf"
-SRCREV_pn-libdrm_om-gta02 ?= "67a3eb2188a38a5000af0ad4ac3a0eba43cab574"
 SRCREV_pn-libefso ?= "194"
 SRCREV_pn-libfakekey ?= "1455"
 SRCREV_pn-libframeworkd-phonegui ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca"
 SRCREV_pn-libframeworkd-phonegui-efl ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca"
 SRCREV_pn-libframeworkd-phonegui-efl2 ?= "917226025c67b75def91e98ea923c2e550474a5b"
-SRCREV_pn-libframeworkd-phonegui-efl-theme-neo ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
 SRCREV_pn-libgdbus ?= "aeab6e3c0185b271ca343b439470491b99cc587f"
 SRCREV_pn-libgee ?= "c21925bf1b714a2aa395192f7adbaeecf7a0e146"
 SRCREV_pn-libgee-native ?= "c21925bf1b714a2aa395192f7adbaeecf7a0e146"
@@ -133,7 +123,6 @@ SRCREV_pn-libnl2 ?= "8808743839b0f459394ecd00cb0f7c1896c0ab7a"
 SRCREV_pn-libowl ?= "277"
 SRCREV_pn-libphone-ui ?= "c9cb5c3ddcd04c5cd2c02214fbc7734b8452981c"
 SRCREV_pn-libphone-ui-shr ?= "acf4a496ed365fad77ab494bccda251141c1b57a"
-SRCREV_pn-libphone-utils ?= "665f27d6c3af092ae56f652c9fe6b5631b4d10db"
 SRCREV_pn-librfid ?= "2094"
 SRCREV_pn-libsnmp-perl ?= "17367"
 SRCREV_pn-libsynthesis ?= "70f0065aa3b085bdf059830f95e5b5766eecb0bb"
@@ -144,13 +133,6 @@ SRCREV_pn-linux-bfin ?= "3758"
 SRCREV_pn-linux-eten ?= "ab2d414f4f13816af0ec0401b608133ca946624a"
 SRCREV_pn-linux-hackndev-2.6 ?= "1308"
 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 ?= "2f04ffc8dd97e15ce30358c3bf00cf6a0e7dcc19"
-SRCREV_pn-linux-openmoko-devel ?= "a15608f241a40b41fed5bffe511355c2067c4e88"
-SRCREV_pn-linux-openmoko-shr-devel ?= "a15608f241a40b41fed5bffe511355c2067c4e88"
-SRCREV_pn-linux-openmoko-shr-drm-devel ?= "e62a4ae1c6783f41b41a9ac3d258786586b65a40"
 SRCREV_pn-linux-sgh-i900 ?= "7e5f8bd3864485e5fc66cb946e09f18b5a32cebc"
 SRCREV_pn-llvm-gcc4 ?= "374"
 SRCREV_pn-llvm-gcc4-cross ?= "374"
@@ -167,8 +149,6 @@ SRCREV_pn-matchbox-panel-2-icon-themes ?= "1907"
 SRCREV_pn-matchbox-stroke ?= "1820"
 SRCREV_pn-matchbox-terminal ?= "1612"
 SRCREV_pn-matchbox-wm-2 ?= "2087"
-SRCREV_pn-mesa-dri ?= "c02cd82b463661def7842f910dc561313559df80"
-SRCREV_pn-mesa-dri_om-gta02 ?= "a8a1c12262998e5fa3a857eebf857c6d3a95f85e"
 SRCREV_pn-midori ?= "400139644371c0b675723f9a986ddab4445a8794"
 SRCREV_pn-mobile-broadband-provider-info ?= "bc536218490377ccbd09c4e5858d37c91c2f03f7"
 SRCREV_pn-moblin-proto ?= "8f2cb524fe06555182c25b4ba3202d7b368ac0ce"
@@ -244,9 +224,9 @@ SRCREV_pn-openmoocow ?= "39648419825cddfea1cb1321e552a12b71fede14"
 SRCREV_pn-openocd ?= "517"
 SRCREV_pn-openocd-native ?= "517"
 SRCREV_pn-opimd-utils ?= "7321c3f1a3cd781f9ed13ea3cac38879429dd420"
-SRCREV_pn-opkg ?= "446"
-SRCREV_pn-opkg-native ?= "519"
-SRCREV_pn-opkg-sdk ?= "446"
+SRCREV_pn-opkg ?= "522"
+SRCREV_pn-opkg-native ?= "522"
+SRCREV_pn-opkg-sdk ?= "522"
 SRCREV_pn-opkg-utils ?= "4578"
 SRCREV_pn-opkg-utils-native ?= "4595"
 SRCREV_pn-oprofileui ?= "173"
@@ -270,7 +250,6 @@ SRCREV_pn-python-coherence ?= "1161"
 SRCREV_pn-python-connexion ?= "1439"
 SRCREV_pn-python-formencode ?= "3148"
 SRCREV_pn-python-gsmd ?= "148"
-SRCREV_pn-python-phoneutils ?= "f1377146556da8a68a84cf10a5f516c5f7b6015b"
 SRCREV_pn-python-pycrypto ?= "d087280d7e9643a3e3f68f209932119fe6738b3c"
 SRCREV_pn-python-pyyaml ?= "344"
 QEMUSRCREV ?= "4242"
@@ -285,13 +264,13 @@ SRCREV_pn-remoko ?= "121"
 SRCREV_pn-remoko-server ?= "121"
 SRCREV_pn-s3c24xx-gpio ?= "4949"
 SRCREV_pn-s3c64xx-gpio ?= "4949"
-SRCREV_pn-serial-forward ?= "4662b55fdba528bb5b3349f83055bf236af5d63b"
+SRCREV_pn-serial-forward ?= "50cf4ff2198589a8db369789fc038604a892a54d"
 SRCREV_pn-settings-daemon ?= "2006"
 SRCREV_pn-shr-config ?= "37dd7ac950e2bfd438801faf34c29fccfdbbaccf"
 SRCREV_pn-shr-contacts ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca"
 SRCREV_pn-shr-dialer ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca"
 SRCREV_pn-shr-installer ?= "f17fa104639113fb0d3212b6bba366c092854cde"
-SRCREV_pn-shr-launcher ?= "102"
+SRCREV_pn-shr-launcher ?= "103"
 SRCREV_pn-shr-messages ?= "9d7ca1cecb93022e5b890cd87756ac6f072710ca"
 SRCREV_pn-shr-settings ?= "ef06fe86c49958673889671c46682c0b2f1d74d7"
 SRCREV_pn-shr-specs ?= "63dd65685a5ab8a304e6c9e12320f07ac58a0aca"
@@ -327,14 +306,13 @@ SRCREV_pn-wesnoth ?= "39828"
 SRCREV_pn-wlan-ng-modules ?= "1859"
 SRCREV_pn-wlan-ng-utils ?= "1859"
 SRCREV_pn-wmiconfig ?= "5394"
-SRCREV_pn-xf86-video-glamo ?= "9918e082104340da42eb92b6bdefce4d9266a6a4"
 SRCREV_pn-xoo ?= "1971"
 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 ?= "45902"
+EFL_SRCREV ?= "46510"
 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-eglibc.inc b/conf/distro/include/sane-toolchain-eglibc.inc
index 4c5f44ff8e..1e370d0b8c 100644
--- a/conf/distro/include/sane-toolchain-eglibc.inc
+++ b/conf/distro/include/sane-toolchain-eglibc.inc
@@ -7,6 +7,14 @@ FULL_OPTIMIZATION = "-fexpensive-optimizations -fomit-frame-pointer -frename-reg
 FULL_OPTIMIZATION_pn-perl = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O1"
 FULL_OPTIMIZATION_sparc = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2"
 
+# JaMa: I promise to report bug upstream, but as it can take a while to fix it, I'll switch to -O2 here
+# Tested with gcc-4.4.2 and gcc-4.4.3 on armv4t and armv5te and it fails with -Os, with gcc-4.3.3 it works OK with -Os
+# Here is testcase, but you have to rebuild whole libqtxml to test it
+# http://lists.shr-project.org/pipermail/shr-devel/2010-February/002169.html
+FULL_OPTIMIZATION_pn-qt4-x11-free = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2"
+# This I've seen only on armv4t, it segfaults when called from pisi, but whole test unit suite can pass
+FULL_OPTIMIZATION_pn-libsyncml = "-fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2"
+
 BUILD_OPTIMIZATION_pn-perl = "-O1"
 BUILD_OPTIMIZATION_sparc = "-O2"
 
diff --git a/conf/distro/include/shr-autorev.inc b/conf/distro/include/shr-autorev.inc
index 93677d08c7..6ae3e22874 100644
--- a/conf/distro/include/shr-autorev.inc
+++ b/conf/distro/include/shr-autorev.inc
@@ -3,6 +3,7 @@ SRCREV_pn-frameworkd-config-shr = "${AUTOREV}"
 SRCREV_pn-frameworkd-config-shr_FSO_REV = "${AUTOREV}"
 SRCREV_pn-frameworkd-config-shr_SHR_REV = "${AUTOREV}"
 
+SRCREV_pn-e-wm-config-illume2-shr = "${AUTOREV}"
 SRCREV_pn-alsa-scenarii-shr = "${AUTOREV}"
 SRCREV_pn-shr-settings = "${AUTOREV}"
 SRCREV_pn-shr-specs = "${AUTOREV}"
diff --git a/conf/distro/kaeilos.conf b/conf/distro/kaeilos.conf
index ee187ba0c9..eb12d2ed04 100644
--- a/conf/distro/kaeilos.conf
+++ b/conf/distro/kaeilos.conf
@@ -2,6 +2,7 @@
 #@TYPE: Distribution
 #@NAME: KaeilOS(R) - http://www.kaeilos.com
 #@DESCRIPTION: KaeilOS Linux Distribution for Kernel 2.6 based devices
+#              based on Angstrom configuration file
 #@MAINTAINER: Marco Cavallini <m.cavallini@koansoftware.com>
 #@VERSION: 11-01-2010
 #
diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf
index b776dbe298..92ecc22879 100644
--- a/conf/distro/shr.conf
+++ b/conf/distro/shr.conf
@@ -100,7 +100,7 @@ ILLUME_THEME = "e-wm-theme-illume-gry"
 # Use bluetooth 4.0
 DISTRO_BLUETOOTH_MANAGER = "bluez4"
 # We want images supporting the following features (for task-base)
-DISTRO_FEATURES = "nfs smbfs wifi ppp alsa ext2 vfat pcmcia usbgadget usbhost pci"
+DISTRO_FEATURES = "wifi ppp ext2 vfat bluetooth usbgadget usbhost"
 # Following features are for ARM and E500 based machines
 DISTRO_FEATURES += "eabi"
 
@@ -155,6 +155,8 @@ OVERRIDES = "local:${MACHINE}:${MACHINE_CLASS}:${DISTRO}:${TARGET_OS}:${TARGET_A
 #############################################################################
 LIBC ?= "eglibc"
 PREFERRED_GCC_VERSION                ?= "4.4.3"
+PREFERRED_VERSION_eglibc             ?= "2.11"
+PREFERRED_VERSION_eglibc-initial     ?= "2.11"
 require conf/distro/include/sane-toolchain.inc
 
 #############################################################################
@@ -195,15 +197,3 @@ DISTRO_EXTRA_RDEPENDS += "\
   angstrom-libc-fixup-hack \
   ${DISTRO_EXTRA_APPS} \
 "
-
-# Additional content II (can be masked with BAD_RECOMMENDATIONS)
-DISTRO_EXTRA_RRECOMMENDS += " \
-    kernel-module-vfat \
-    kernel-module-ext2 \
-    kernel-module-ext3 \
-    kernel-module-af-packet \
-    openssh-sftp-server \
-"
-
-#    avahi-daemon \
-#    avahi-autoipd \
diff --git a/conf/distro/slugos.conf b/conf/distro/slugos.conf
index d9b00f41a8..4b77cf8f6a 100644
--- a/conf/distro/slugos.conf
+++ b/conf/distro/slugos.conf
@@ -14,6 +14,7 @@ ARM_INSTRUCTION_SET = "arm"
 TARGET_OS = "linux-gnueabi"
 IPKG_VARIANT ?= "opkg-nogpg-nocurl-slugos"
 PREFERRED_PROVIDER_opkg ?= "opkg-nogpg-nocurl-slugos"
+PREFERRED_PROVIDER_virtual/update-alternatives ?= "opkg-nogpg-nocurl-slugos"
 IMAGE_INITSCRIPTS ?= "initscripts-slugos"
 
 require conf/distro/include/slugos.inc
diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index e7c4559039..643ae0b611 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -30,9 +30,6 @@ BBFILES := "${@bb.fatal('Edit your conf/local.conf: BBFILES')}"
 # This is a regulary expression, so be sure to get your parenthesis balanced.
 BBMASK = ""
 
-# Proxy settings:
-# BB_ENV_EXTRAWHITE="http_proxy ftp_proxy no_proxy"
-
 # Uncomment this if you want to use a prebuilt toolchain. You will need to
 # provide packages for toolchain and additional libraries yourself. You also
 # have to set PATH in your environment to make sure BitBake finds additional binaries.
diff --git a/conf/machine/bug.conf b/conf/machine/bug.conf
index d79cf15129..e45629d191 100644
--- a/conf/machine/bug.conf
+++ b/conf/machine/bug.conf
@@ -3,7 +3,7 @@
 #@DESCRIPTION: Machine configuration for the BUG base unit.
 TARGET_ARCH = "arm"
 
-MACHINE_EXTRA_RRECOMMENDS = "marvell-gspi-fw marvell-sdio-fw"
+MACHINE_EXTRA_RRECOMMENDS = "marvell-gspi-fw marvell-sdio-fw kernel-modules"
 PREFERRED_PROVIDER_virtual/kernel = "linux-bug"
 
 MACHINE_FEATURES = "kernel26 screen touchscreen hotplug alsa wifi usbhost usbgadget"
@@ -15,6 +15,9 @@ require conf/machine/include/tune-arm1136jf-s.inc
 
 KERNEL_IMAGETYPE = "uImage"
 
+MACHINE_DISPLAY_WIDTH_PIXELS = "320"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "240"
+
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 XSERVER = "xserver-xorg \
            xf86-input-evdev \
diff --git a/conf/machine/ea3250.conf b/conf/machine/ea3250.conf
new file mode 100644
index 0000000000..50099a2c4b
--- /dev/null
+++ b/conf/machine/ea3250.conf
@@ -0,0 +1,27 @@
+#@TYPE: Machine
+#@NAME: Embedded Artists LPC3250 machine
+#@DESCRIPTION: Machine configuration for Embedded Artists LPC3250 development board
+#@WEBSITE: http://www.embeddedartists.com/products/kits/lpc3250_kit.php
+
+TARGET_ARCH = "arm"
+
+require conf/machine/include/tune-arm926ejs.inc
+
+MACHINE_KERNEL_PR		= "r0"
+
+MACHINE_FEATURES 		= "kernel26 usbhost ext2 vfat"
+MACHINE_TASK_PROVIDER 		= "task-base"
+
+USE_DEVFS = "0"
+
+PREFERRED_PROVIDER_virtual/bootloader = ""
+PREFERRED_PROVIDER_virtual/kernel = "linux-ea3250"
+PREFERRED_VERSION_linux-ea3250 = "2.6.27.8"
+
+IMAGE_DEVICE_TABLES = "files/device_table-slugos.txt"
+IMAGE_FSTYPES = "tar.gz"
+SERIAL_CONSOLE = "ttyS0 115200"
+
+KERNEL_IMAGETYPE = "uImage"
+UBOOT_ENTRYPOINT = "0x80008000"
+UBOOT_LOADADDRESS = "0x80008000"
diff --git a/conf/machine/eee701.conf b/conf/machine/eee701.conf
index 0c4b965655..b08ac6f2d7 100644
--- a/conf/machine/eee701.conf
+++ b/conf/machine/eee701.conf
@@ -6,20 +6,21 @@
 
 require i686-generic.conf
 
-PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
-PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
-MACHINE_DRI_MODULES ?= "i915"
+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 \
+XSERVER = "xserver-xorg \
            xf86-video-intel \
            xf86-input-evdev \
-	   xf86-input-keyboard \
-	   xf86-input-mouse \
-	   xf86-input-synaptics"
+           xf86-input-keyboard \
+           xf86-input-mouse \
+           xf86-input-synaptics \
+           "
 
 IMAGE_FSTYPES += "tar.gz"
 
diff --git a/conf/machine/hawkboard.conf b/conf/machine/hawkboard.conf
index ae53a53377..7251de70c1 100644
--- a/conf/machine/hawkboard.conf
+++ b/conf/machine/hawkboard.conf
@@ -11,4 +11,19 @@ UBOOT_LOADADDRESS = "0xc0008000"
 
 MACHINE_FEATURES = "kernel26 serial ethernet ide screen"
 
+# do ubiattach /dev/ubi_ctrl -m 4
+# From dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: logical eraseblock size:    129024 bytes
+# from ubiattach stdout:
+# UBI device number 0, total 960 LEBs
+MKUBIFS_ARGS = "-m 2048 -e 129024 -c 960"
+
+# do ubiattach /dev/ubi_ctrl -m 4
+# from dmesg:
+# UBI: smallest flash I/O unit:    2048
+# UBI: physical eraseblock size:   131072 bytes (128 KiB)
+# UBI: sub-page size:              512
+UBINIZE_ARGS = "-m 2048 -p 128KiB -s 512"
+
 SERIAL_CONSOLE = "115200 ttyS2"
diff --git a/conf/machine/imote2.conf b/conf/machine/imote2.conf
new file mode 100644
index 0000000000..06a4fbf61a
--- /dev/null
+++ b/conf/machine/imote2.conf
@@ -0,0 +1,15 @@
+#@TYPE: Machine
+#@Name: Crossbow iMote2
+#@DESCRIPTION: Machine configuration for Crossbow iMote 2
+TARGET_ARCH = "arm"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux"
+
+PACKAGE_EXTRA_ARCHS = " iwmmxt"
+
+require conf/machine/include/tune-xscale.inc
+
+# used by opie-collections.inc
+ROOT_FLASH_SIZE ?= "32"
+
+MACHINE_FEATURES = "kernel26 usbgadget alsa iwmmxt"
diff --git a/conf/machine/include/initramfs-kexecboot.inc b/conf/machine/include/initramfs-kexecboot.inc
index 6ee1ddc3fa..bc9cd518e2 100644
--- a/conf/machine/include/initramfs-kexecboot.inc
+++ b/conf/machine/include/initramfs-kexecboot.inc
@@ -1,13 +1,18 @@
-# initramfs-kexecboot specific config options
+# Initramfs-kexecboot extra config
 
-MACHINE_FEATURES_append = " kexecboot "
 
+# If set here, each image will also build linux-kexecboot.
+# Usually the machine-installer recipe already DEPENDS on it
+#
 EXTRA_IMAGEDEPENDS += "linux-kexecboot"
 
-# Include kernel image in kexecboot enabled images
-RDEPENDS_kernel-base = "kernel-image" 
 
-# we store kernel images in rootfs and only a minimal initramfs kernel in nand for booting other kernels
-DONT_CHECK_KERNELSIZE ?= "1"
+# Force inclusion of kernel in target images
+# (done by default)
+#
+RDEPENDS_kernel-base = "kernel-image"
 
-MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_append = " kexecboot-cfg"
+
+# Install /boot/boot.cfg in target images
+#
+MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS_append = " kexecboot-cfg "
diff --git a/conf/machine/include/kirkwood.inc b/conf/machine/include/kirkwood.inc
index 8507857b11..d43cb36e23 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 = "r16"
+MACHINE_KERNEL_PR = "r17"
 
 IMAGE_FSTYPES += "tar.gz ubi"
 SERIAL_CONSOLE = "ttyS0 115200"
diff --git a/conf/machine/include/zaurus-kernel.inc b/conf/machine/include/zaurus-kernel.inc
index 1ba4a3422d..bbbb38315c 100644
--- a/conf/machine/include/zaurus-kernel.inc
+++ b/conf/machine/include/zaurus-kernel.inc
@@ -4,13 +4,12 @@ MACHINE_KERNEL_VERSION = "2.6"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
 
-# Starting with 2.6.32 linux-rp is deprecated
+# Starting with 2.6.32 linux-rp is deprecated for some models
 #PREFERRED_PROVIDER_virtual/kernel = "linux"
 PREFERRED_PROVIDER_virtual/kernel_collie = "linux"
 PREFERRED_PROVIDER_virtual/kernel_tosa = "linux"
 
-KERNEL_IMAGE_MAXSIZE = "1294336"
-KERNEL_IMAGE_MAXSIZE_collie = "1048576"
-
+# Default bootloader expects "zImage", use "uImage" for u-boot
+# Note: kexecboot can boot both kind of images
 ZAURUS_KERNEL_IMAGETYPE ?= "zImage"
 KERNEL_IMAGETYPE = "${ZAURUS_KERNEL_IMAGETYPE}"
diff --git a/conf/machine/om-gta01.conf b/conf/machine/om-gta01.conf
index 5d00eae22e..ccd2b7ae9e 100644
--- a/conf/machine/om-gta01.conf
+++ b/conf/machine/om-gta01.conf
@@ -15,7 +15,7 @@ PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-shr-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"
+PREFERRED_PROVIDER_virtual/libgl_shr = "mesa-dri"
 
 UBOOT_ENTRYPOINT = "30008000"
 
diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf
index eb48d01aac..9733269d4f 100644
--- a/conf/machine/om-gta02.conf
+++ b/conf/machine/om-gta02.conf
@@ -41,7 +41,11 @@ READER_UI         = "gtk"
 
 # package machine specific modules
 MACHINE_EXTRA_RRECOMMENDS = "\
-  kernel-modules \
+  kernel-module-s3cmci \
+  kernel-module-snd-soc-neo1973-wm8753 \
+  kernel-module-snd-soc-neo1973-gta02-wm8753 \
+  kernel-module-g-ether \
+  kernel-module-ar6000 \
 "
 
 # no need to bypass this as in om-gta01, since this model is not using a multiplexed ttySAC0
diff --git a/conf/machine/omapzoom.conf b/conf/machine/omapzoom.conf
index 4732f68c98..ab0612f292 100644
--- a/conf/machine/omapzoom.conf
+++ b/conf/machine/omapzoom.conf
@@ -14,10 +14,7 @@ XSERVER = "xserver-xorg \
 # Only has DVI connector for external screen
 GUI_MACHINE_CLASS = "bigscreen"
 
-#include conf/machine/include/tune-arm1136jf-s.inc
-# requires gcc 4.3.0:
-include conf/machine/include/tune-cortexa8.inc
-
+require conf/machine/include/omap3.inc
 
 IMAGE_FSTYPES += "tar.bz2 jffs2"
 EXTRA_IMAGECMD_jffs2 = "-lnp "