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

11 files changed, 120 insertions, 36 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index e07f929acd..29f535c6ab 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -1410,6 +1410,10 @@ sha256=bc691463af8506c1c84db0edab727ee8f8ee4ecd1777b0e264db2525d4500833
 md5=de60df7541fafe8c6a3397e0f105ff0e
 sha256=c487645d32b8124b9ae224b8929e5aa45e581bd8d8c8da666add423cf927d1ea
 
+[ftp://ftp.alsa-project.org/pub/lib/alsa-lib-1.0.20.tar.bz2]
+md5=6e9080ba1faa5d3739d14dd76c62d8dc
+sha256=15f8d0eef1da10c62136107e7b585bc8beb9c9e9b7ad177654097f8c15e57a63
+
 [ftp://ftp.alsa-project.org/pub/oss-lib/alsa-oss-1.0.11.tar.bz2]
 md5=3106c2d59a329263867fa3dd44133dda
 sha256=6b688a3895a14945d0622e16cfdb9292ef9f953ab2d195b08595736f76e5a790
@@ -1550,6 +1554,10 @@ sha256=17da486f983597f28c0efadb261b76b733155be7451ef34eefc65cb4058d883d
 md5=d5d7c69837cc7dcbf2aa181ff423ab20
 sha256=a938c07ea331359f379802c50c33aa0307b913f742ad74087d45e7fb2a1f4d50
 
+[http://xorg.freedesktop.org/releases/individual/proto/applewmproto-1.2.0.tar.bz2]
+md5=44e18d01857f9dfeb8628e317e786f31
+sha256=4f549083df9db85e61d0b272645e3dc71bacde9b9156ca20a57440e794b71042
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/proto/applewmproto-X11R7.0-1.0.3.tar.bz2]
 md5=2acf46c814a27c40acd3e448ed17fee3
 sha256=db738777fd573bede8e41f121f31692e8ec70bb822b5dcd263973533273fc5ec
@@ -4978,6 +4986,10 @@ sha256=545ce9830f0cf649e3b1b40d25d13989c23302623bf9b50f4c24402f63c82184
 md5=1d70f0653b0b3a837853262dc5d34da4
 sha256=69def6d1f64b3699ec9c729596d8b096623a62bdda6bbea78ed690421d174c11
 
+[http://xorg.freedesktop.org/releases/individual/proto/dri2proto-2.0.tar.bz2]
+md5=26f6515322ec50691584ac74291b4254
+sha256=1954a7e96d7fe70611c483836ed143e84a069eed6d3dab22c05a531bfb6da9e4
+
 [http://www.ex-parrot.com/~chris/driftnet/driftnet-0.1.6.tar.gz]
 md5=8e11d77770452f97bb3c23f510489815
 sha256=dbdf7ead3ae14b109f88c86dedeb7524be8c257aa773a781891216f013373d6d
@@ -10222,6 +10234,14 @@ sha256=80655b3531ea56a5d64085e572dfb8d3ecabffd28af482cd130f72dfdd6254b0
 md5=ae7177ab8f0163d3ef2df71f0de2b357
 sha256=33dd87dc9452227375b8b9cdad940581714a55d55ff18ae2990905ac2f81fa0f
 
+[http://downloads.sourceforge.net/hamlib/hamlib-1.2.8.tar.gz]
+md5=74eaf1be4cf1cbdecee54808c6930788
+sha256=be81153a6e2830234d62818c8aa5658b1410b538a3676686a3f1373f03036b81
+
+[http://downloads.sourceforge.net/hamlib/hamlib-1.2.9.tar.gz]
+md5=9515288826284d6c8dd569354dacc8e0
+sha256=ba75e64e1b6d5ffaa41e2063e475eca5b35ad68cb4ee6e888e0fc73bd6fa9fba
+
 [http://www.soft.uni-linz.ac.at/~vogl/bluez/handsfree-040326.tar.gz]
 md5=488b0f2f346361bba7996b459c5d7b6f
 sha256=dbd0c389a160c9f6dcd9eac81b6c4d5a02866968a33f06201556d6860012f6c3
@@ -11282,26 +11302,6 @@ sha256=4c4f3c7c479994c3ce09f542d4fbdc03eed58a2d7f320d32f2baf238b5b6f566
 md5=b941b8f4de297827f3211c2cb34af199
 sha256=79e80af8cbeb68ddad75a1aa6244d7acd62176bfd69bcdc0640d11177dcde97d
 
-[http://downloads.sourceforge.net/jamvm/jamvm-1.3.0.tar.gz]
-md5=4f0af6c15f1b9fc50375d30a422bc88f
-sha256=445813850236d5ea54942df45046ee9414192b403fb8fb1b8e7cfce0f3ace761
-
-[http://downloads.sourceforge.net/jamvm/jamvm-1.3.1.tar.gz]
-md5=cceb887aec78fee99773949ede34759e
-sha256=3a089c19c49e0e29f319d60afac73708a80a22ac42a9728316193e680f4cec5d
-
-[http://downloads.sourceforge.net/jamvm/jamvm-1.3.2.tar.gz]
-md5=f63b7cf4b541a144c41f17fffb7cc869
-sha256=6740f2cef6a2620bc5959eb65562866ffb5c45050a04555aed244abcbe30f88d
-
-[http://downloads.sourceforge.net/jamvm/jamvm-1.4.1.tar.gz]
-md5=ed79d6b60e50b007614831f8c28321ac
-sha256=a73727c9c2e15d6302cf4f5d3aaf8378c5de9d60a302b9d5fa4ee5332341f867
-
-[http://downloads.sourceforge.net/jamvm/jamvm-1.4.2.tar.gz]
-md5=c7affcc61d4135ee838121a57b08de0f
-sha256=dae915b7f963762385df2f4660eaad497261fa72393ba69339530e5b0b5d8bc3
-
 [http://downloads.sourceforge.net/jamvm/jamvm-1.4.5.tar.gz]
 md5=3f538bab6e1c77aed331e5e71f754f5b
 sha256=f329d1c8f42c06b53a3e82763d33900b100b8e9acd7afe02f7583c51253fd6e5
@@ -11330,6 +11330,10 @@ sha256=663895bd69caf3a1fda6af5eea8263d90a5fd35ca8f4c32e2210ac410788901a
 md5=2a564045670b459e9aed857b5f8a3391
 sha256=76c976616d344a3b1abd8896be6610c4d97a58af6960e1bc2f442b774bdda839
 
+[http://downloads.sourceforge.net/jamvm/jamvm-1.5.3.tar.gz]
+md5=ce886163658d748113b0570dfae12aea
+sha256=f2795ab62635df1c9bc6c4a7b90f53d0d846c0c26f5ec7b352f687506407ebd8
+
 [http://downloads.sourceforge.net/gakusei/jards_gakusei.cvs.sourceforge.net__20070212.tar.gz]
 md5=1282913edd226bc9e865f39d79573117
 sha256=3c884982ebf40aade899379902ec92c41782d18c19506cf0ec40bcf6a7df8e3b
@@ -11638,6 +11642,10 @@ sha256=1b998b34e2e9377f5ac7704295d64507234fe7656e49d384f8bf95604e97e05b
 md5=2100c667e69db0cde35fa2d06c8516e2
 sha256=023e7f47039c1ad8615052e464f76a3cd496a423449b931036d127c56d58b2b9
 
+[http://www.kismetwireless.net/code/kismet-2008-05-R1.tar.gz]
+md5=6ee365d36354b4dee4945e67f8149294
+sha256=a298d44f8a6ec977021cd492a720987ded81b5c4baf5f68b36f1282a23c9f7d3
+
 [http://kernel.org//pub/linux/libs/klibc/Stable/klibc-0.190.tar.bz2]
 md5=6c96f954676c7b898dfe230e0f2a1fb5
 sha256=5767cbb094300c5e26eb0bab588ecdbf9e5db2a637e9ae73c2efb8a62e05217e
@@ -11854,6 +11862,10 @@ sha256=463f0b46ce3a0fc09ef9ad7a5429959034d50a1eadbed5dfeae36c25dca31130
 md5=48a403c45be2206ee900729ced3a0e62
 sha256=ecd2ff407a418eb4ac673f48b4d0a9c5b6860a13cef7211a32fe8f3d3db0407e
 
+[http://xorg.freedesktop.org/releases/individual/lib/libAppleWM-1.2.0.tar.bz2]
+md5=d58b5a03ba36c661ff48f38048c2edd3
+sha256=82f9b9dff544fc3d8bcda5878930cdc3817d478f34b3790c599fe185c138f160
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libAppleWM-X11R7.0-1.0.0.tar.bz2]
 md5=8af30932ebc278835375fca34a2790f5
 sha256=66d5b9d53816cc158a0f241772cbde60a52aa0a722e28d3ef76a5eb6c82840d5
@@ -11962,6 +11974,14 @@ sha256=bdbd6d239435c1736f5c532b12e8078761db8db5f37ab3195fe11c3e5b692c1c
 md5=d1512d65dadd4f48c779d4749e7753a8
 sha256=da9272900e41615e9c5dc25d84730b8966da6f5c8f4c40418dca2ad040fc8b82
 
+[http://xorg.freedesktop.org/releases/individual/lib/libX11-1.2.1.tar.bz2]
+md5=2f2beb98e71f397e1209beaca4e97cb1
+sha256=d172e5a401a2607f4ff145db4e8e09c193a1980bbb2c5c7f824e61ee3fdfdff3
+
+[http://xorg.freedesktop.org/releases/individual/lib/libX11-1.2.tar.bz2]
+md5=c6265b59ea2b594fd68e33f9125b4d20
+sha256=e4863cdf5d471763806e9bcae25ea47606a56cd91a5546a34c093aa3de181051
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libX11-X11R7.0-1.0.0.tar.bz2]
 md5=dcf59f148c978816ebbe3fbc5c9ef0e1
 sha256=89a3c2d8324ff9d0d91682503407310f7df30a74915cd253be3a75247b044248
@@ -12018,6 +12038,10 @@ sha256=45ca55bdac904a07b8118618c65ddb5bf8826e626c4c927e3c2508c58e231514
 md5=73671d8f1cf36fdd81395328cc3539c9
 sha256=11f4ab184fb8dc853fd95238d4de7b251427dd036643d11fd2a669232fa35af9
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXaw-1.0.5.tar.bz2]
+md5=64e7782db4653cb57c7f7e660b2431c3
+sha256=2503f3e3348ee3cf38368161dfab8112d3aea2a26deea34f3136898c13cfb88d
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXaw-X11R7.0-1.0.1.tar.bz2]
 md5=ded3c7ed6d6ca2c5e257f60079a1a824
 sha256=076ed9c4b07379b1a957753a3c8fd2a1d93ba460587d450787630f81a85f9741
@@ -12110,6 +12134,10 @@ sha256=2d706baf206d1cb422c8e0ceb6c5a8546bc3f0587cf090eba51e75a295d9c3f0
 md5=a91f1f722ac80c597cf0b75dcb8b48c0
 sha256=2dfd8eace1cafacc87b4055c57efeb771a740e24141d3f113de58c2a9eebd21f
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXext-1.0.5.tar.bz2]
+md5=aa11d859cc8e9a0bad3bb55e1666547b
+sha256=1280af98466cb4484a89858ede3347ba9d7785baeb80b11f2066142dc2317d97
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXext-X11R7.0-1.0.0.tar.bz2]
 md5=9e47f574ac747446ac58ff9f6f402ceb
 sha256=5ccefe638c3dfc12fd8c2f2de38ec7e0e0b54bb271fa75f687e474a58edbad28
@@ -12158,6 +12186,10 @@ sha256=c167cfd529b7c67f496ee0bed3c0b43e0107de0f689d387c1c0e23ef7cf3d2f2
 md5=4f174b9613f87cf00d731da428a1b194
 sha256=6171e6bca4bd6333611bd9c63cccc8e8e412d876c72097f0dddc490a9df51d5a
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXfont-1.4.0.tar.bz2]
+md5=3a8e06b25912ef339d70a8ba003da9b5
+sha256=eafff0157f2c7172214449d4b6b0c72328cad7026ecace226189b511791c5f75
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXfont-X11R7.0-1.0.0.tar.bz2]
 md5=955c41694772c9fd214e3e206f5d2178
 sha256=47d4de6986f6ca85bc48ecd76188d7f3f009e1aeb640008cab12ac5ca5896622
@@ -12210,6 +12242,10 @@ sha256=c77a5bbe97d0d0a6493adefcf1bd57aca91bc33279633b3f6cf1d2bb8812153f
 md5=4b88e07d7dd77ca1e786f09066b58c02
 sha256=7c0125ffb864e121ebfb5a20b1cfdff60562c2f2dfbb4e77c5eac81f36e15f3a
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXi-1.2.1.tar.bz2]
+md5=cfb36307e8e7ffafe40848dba24e0b11
+sha256=a0cef8deaccedb877137782a7e77441c8231b2da848bd145788a12fe05034fc5
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXi-X11R7.0-1.0.0.tar.bz2]
 md5=99503799b4d52ec0cac8e203341bb7b3
 sha256=64e8ece13fc778b9dd86ef93c4b782de9a1176a005ed7d895552a73acb103d9b
@@ -12302,6 +12338,10 @@ sha256=206f8dc850f12b1213fb73dbef09fafa1bb8fb8c3ddfe4d39721c1e2dec12a98
 md5=5cd67cc02a50c9644ba0a1846ea3b08e
 sha256=f8edfe26b8c4c3677a3a949f81a8b09a5fad62972020bfd230401e11cc0ed267
 
+[http://xorg.freedesktop.org/releases/individual/lib/libXrandr-1.3.0.tar.bz2]
+md5=68eb59c3b7524db6ffd78746ee893d1d
+sha256=5961ce0f77c5173a8208b3ed669ac01719f2bf4a10517ffa6c33a5e064802e78
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/lib/libXrandr-X11R7.0-1.1.0.2.tar.bz2]
 md5=e10aed44c2e1e5d9e6848a62ff2c90c7
 sha256=6b6a3fcf44621bf163ba2db6dbcc518bff4e8cf74695d1b86595387a3ff3c6fb
@@ -14046,6 +14086,10 @@ sha256=a214c4e1d7e22a758f66fe1d08f0ce41c3ba801a4c13dd1188e1e38288ac73c0
 md5=6d5468debf76fac84576ca26c9535821
 sha256=2f609ad3b5688ae66dcd18d7cdd1fc6b68531a2a85f89798f6cfb5eda6d680dc
 
+[http://xorg.freedesktop.org/releases/individual/lib/libpciaccess-0.10.6.tar.bz2]
+md5=ba25eb7582f69428648e8c67564d68e5
+sha256=b9532db51a093221f82e6659ab2979d357eac770d6eb9e9361efead0aca709ce
+
 [http://www.xmailserver.org/libpcl-1.4.tar.gz]
 md5=6d63c462911349de80109c0161ed6d37
 sha256=3c64155a9218c0367f3b0afd4bd8a4a46cc467ad6c85e98952a4ef517b183686
@@ -20502,6 +20546,10 @@ sha256=9e1db25eec33ba1dff95010d6b8f1150ea40e7f953f1b6b7668a69a1171d23df
 md5=e2e45564f8ce22e00e1360e79c8ccdeb
 sha256=102fd42f8f2562450f4e45c28bfb0390c2d30ffa6a805eead15d67018930f654
 
+[http://xorg.freedesktop.org/releases/individual/proto/randrproto-1.3.0.tar.bz2]
+md5=a49416013fff33c853efb32f1926551e
+sha256=cfeb1429465e3c24debde1bf53ec35ef738fde5e80d2eed14f33e315e747bb8d
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/proto/randrproto-X11R7.0-1.1.2.tar.bz2]
 md5=bcf36d524f6f50aa16ee8e183350f7b8
 sha256=7a5eb58f10d02f58c2f7fb153bb5dc6d72173d5fa3d317bdbd9674f4577e0ad0
@@ -20730,6 +20778,10 @@ sha256=13cce714959056d41627ec9442342d46072f9d72ef57554b9d03ebfb353ed2d1
 md5=613eed8201d37be201805e5048ebb0c3
 sha256=084e250d2392369b2548b663e61bcf128baecb2f527e381e9ba89f0148db2c0d
 
+[http://ftp.gnome.org/pub/GNOME/sources/rhythmbox/0.12/rhythmbox-0.12.1.tar.bz2]
+md5=f17a72465dc43d554b11cf7b18776bff
+sha256=1f444b9cd74615831dab7ec8cd3c58c95d7436372df9a768bd701ab4321a8721
+
 [http://ftp.gnome.org/pub/GNOME/sources/rhythmbox/0.8/rhythmbox-0.8.5.tar.gz]
 md5=5ac4e1b5ff4f2fdada81c007ac599cb9
 sha256=654d6b190f4644d82c10b4ce5645b72405c2e78ea346ce3d8eb385fc3f3732de
@@ -21118,6 +21170,10 @@ sha256=2a11ba05f34b2978af3add623a641e0340d39322b4ca2bd26baae743c78de956
 md5=953dc98dbd78fba3a80d554514581d26
 sha256=0431955a17cd687a28c9b005a6afbc11d8db9348cd4ec91c5600f4f662819e07
 
+[http://slimlogic.co.uk/pub/downloads/libscenario/scenario-lib-0.2.0.tar.bz2]
+md5=18b370f6ff89546df66fe64a2efd676a
+sha256=d76d0e8267e781e4ed4a93c9f51b7ae1257bfb2fadb8d8f5b64414b5340b1239
+
 [http://savannah.nongnu.org/download/scew/scew-0.3.1.tar.gz]
 md5=e9a69f7014cad332cc78667b07eebbce
 sha256=0e966359b9e1de31bf375b2a982b7f63cc6dd0c253bda480d1913c668791972a
@@ -22982,6 +23038,10 @@ sha256=5730611c42f8a8540343faa9512d9161073d2f882668c80dd0cf6a34c72daa75
 md5=fa658ae2f20458d3c5d3effba3b2dd7e
 sha256=3193c3446d211db2bd3c169c86f6d433666669336bd589a20c87f1483295cf2a
 
+[http://ftp.gnome.org/pub/GNOME/sources/totem-pl-parser/2.26/totem-pl-parser-2.26.2.tar.bz2]
+md5=daffda80cfead2a1473ca3ff71e1057b
+sha256=3a6dd0382fe074f23a747b08423fccb23fb38c25b1feddacbd4875d8b8c83743
+
 [http://www.gnome.org/~jamiemcc/tracker/tracker-0.5.4.tar.gz]
 md5=724208e1b2d235148499672b44181298
 sha256=ad214a2692041f423d2150777c233b21cab2d108f849edc513192587ac63c9c2
@@ -23642,6 +23702,10 @@ sha256=4f2a8a19e90ad82bc2da4eb52799a299a1c94bf5143bc2711e9e5d4cc5a7cdb4
 md5=ea2d9cd33ca6fd05923f007bd74d7c37
 sha256=97748154c41a1cd12635a79aee0c2846fd48ecb555fc8b54e3e5baec174e6e74
 
+[http://xorg.freedesktop.org/releases/individual/util/util-macros-1.2.1.tar.gz]
+md5=81b9746d6202ccf0b4a498cfd0731e71
+sha256=f3804f02f51a1be243ce7413dc67dca774f000686f8f2efedc77203a1962d401
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/util/util-macros-X11R7.0-1.0.1.tar.bz2]
 md5=bc6be634532d4936eb753de54e1663d3
 sha256=e95a45db65b33be472a3134492e348c4cd6edc200d02a85654ffe62bc2e6fdcd
@@ -24698,6 +24762,10 @@ sha256=53f3039ae769b08bd139d4474a7debe0b6f24048e7c514c835c8a1880f11e0d9
 md5=3a2e0252e853ab30b3bff05ac92ec61c
 sha256=3972428e3651c9159aff655c9c794728520c3ce3d66ac219ec5243d5d73d4db4
 
+[http://xorg.freedesktop.org/releases/individual/proto/xextproto-7.0.5.tar.bz2]
+md5=e6841018a7c64983b0954aa2c564d115
+sha256=d33e1f3c96daad78667b2dfc14a1ce2ee3bdce19409f82cd5ede6c696ca5b042
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/proto/xextproto-X11R7.0-7.0.2.tar.bz2]
 md5=c0e88fc3483d90a7fea6a399298d90ea
 sha256=41c091d05943817c0b667192dab8c8f3a3a59c04a66dd311a9573f48a7b70b3b
@@ -24898,6 +24966,10 @@ sha256=825adcadaf4c90d4cb1d0bd21dcf67bf3b895f12f8e7bf186ed936445dc015ca
 md5=a6070ead29b2d81b5b386a96df2661b8
 sha256=45c4b6df8d1dbc4db8aa580be4f3c693ebba4eba4908d82489948827d3bed0e5
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-2.2.2.tar.bz2]
+md5=23341f098e7fe8ec13ef06ef784ac51a
+sha256=63606119e86c27b47bd7ec4b2b6048b76515df6755fc5dd8bcfc98f5fe53d994
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-evdev-X11R7.0-1.0.0.5.tar.bz2]
 md5=d982c6f185f4c75a4b65703ceed7be06
 sha256=ba53e8ce6bfa01da7fa86a31853542a71722b41b511041bdb58cf66c10f3edb4
@@ -24994,6 +25066,10 @@ sha256=c25b35524eaf00928d97bd0d8bf9e489d92993b133461b5f4d8d9655d37ec072
 md5=ebe5dcf8eed819103909f18321fc3b9d
 sha256=7b514715dfb5a2512dea3355bc3f09eb879d7184440c5525f0a9d29ec9f3be42
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-keyboard-1.3.2.tar.bz2]
+md5=d6fe929c4f6085d6dd67f197ae9c42f6
+sha256=33939ec65dbf56f49e1e7de854a1cf95446e40c533950431901567e67112aef2
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-keyboard-X11R7.0-1.0.1.3.tar.bz2]
 md5=8fb8a30fd9d7f152a1aef4eb8ef32b3f
 sha256=e82d510157d13be37eed604cfb0d9355c054c4d3ac39bdef0c6ef320f2973d77
@@ -25074,6 +25150,10 @@ sha256=a07cb2169f43018c90b7889781c0db30cda0da03811edccb8c4db533166357ab
 md5=31a51b0e5ddc4fac19754f48a3adf881
 sha256=054b253f366795c2865714ce8bc545c79e59aa9ce1b7a9a4a05b9c674dff9dec
 
+[http://xorg.freedesktop.org/releases/individual/driver/xf86-input-mouse-1.4.0.tar.bz2]
+md5=e7dc0759c14a9bfd373917a49e5f7c7d
+sha256=e6e1dbd64d41c826619a5881c5aeed46095bfdcb87c3e27d65292fc12a5bb7c7
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/driver/xf86-input-mouse-X11R7.0-1.0.3.1.tar.bz2]
 md5=12a908e5a97b1b03e8717abf167f4f27
 sha256=183c1cda6550c8821ef4b8d13e681a32813bcd32b6cf34a75d3870e399fa292d
@@ -26754,6 +26834,10 @@ sha256=2f36880bffaee0a5b2b704376a02b22066b6842445e1d77da698854e5973eb21
 md5=308971036e25250e7fe3cccfd5a120f8
 sha256=a680174f54be7763819e5275c5d5d44fc9e9b6f8e9351dd45c150eb4c182d5bb
 
+[http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.6.1.tar.bz2]
+md5=ed0878bf32a24d4948c3b8a122a39eff
+sha256=0edbaa994797cb7944a4129d33b634ad99164b21ec32355d56996a178d38bfcf
+
 [http://xorg.freedesktop.org/releases/X11R7.0/src/xserver/xorg-server-X11R7.0-1.0.1.tar.bz2]
 md5=0e7527480fb845a3c2e333bd0f47ff50
 sha256=0419124e1bab473f8f9e2d7de1dba8bae2ed1375b72d55cdfb9471dac357ed47
@@ -26890,6 +26974,10 @@ sha256=bec5a98bbea56da069785784116261ec956df039fb07d0cdca53ae1ed03ebc0f
 md5=7d26f45dca52632712a696e0631dc17b
 sha256=6f6328922d69f5de29513a5baf1d010db2a7a54cb58a7a6cbbb1b25097ecd592
 
+[http://xorg.freedesktop.org/releases/individual/proto/xproto-7.0.15.tar.bz2]
+md5=1a2b31430d04340be2e49e8b6445e076
+sha256=fd8cd0bc3e94d7416e6af9eddfa909b0e64246e0d2bb41c00f4e02bd85c76bee
+
 [http://xorg.freedesktop.org/releases/development/X11R7.2-RC3/proto/xproto-7.0.9.tar.gz]
 md5=937c572775ff4a2edfbbf5568dc0e959
 sha256=e68db1c55c1c6d398098d69096b3c3b35863b5d25ef216cb2d1d4364ab0000af
@@ -27154,6 +27242,10 @@ sha256=16bc4646f105efd3d0dd105899ac19035d67acf50950ca8c70cf68772508272d
 md5=96e142331edd498a9364887b2548f1bb
 sha256=9ff21a8d9ea524ca9b7cb6d6b4d522b4cb20b1c35edeb8995a9e9265a0df64bd
 
+[http://xorg.freedesktop.org/releases/individual/lib/xtrans-1.2.3.tar.bz2]
+md5=f9cf791dfad59cf044e276aab3a71e1d
+sha256=a67a8b09d9530021e2bd4b93136f385e72a8d8e4f2c26a99aeb169bee88facf0
+
 [http://xorg.freedesktop.org/releases/individual/lib/xtrans-1.2.tar.bz2]
 md5=a91fef8b932b21992af7dfff7b2643f3
 sha256=d6c3cabd5ecd0183a8a9bc6b3471545df8e2c78956b4c4cfd48f0c545a88c9a4
diff --git a/conf/distro/angstrom-2008.1.conf b/conf/distro/angstrom-2008.1.conf
index ad34b7d48c..d365a38c24 100644
--- a/conf/distro/angstrom-2008.1.conf
+++ b/conf/distro/angstrom-2008.1.conf
@@ -123,11 +123,6 @@ PREFERRED_VERSION_gcc-cross-sdk          ?= "${ANGSTROM_GCC_VERSION}"
 PREFERRED_VERSION_gcc-cross-initial      ?= "${ANGSTROM_GCC_VERSION}"
 PREFERRED_VERSION_gcc-cross-intermediate ?= "${ANGSTROM_GCC_VERSION}"
 
-#Loads preferred versions from files, these have weak assigments (?=), so put them at the bottom
-require conf/distro/include/preferred-e-versions.inc
-require conf/distro/include/preferred-xorg-versions-X11R7.4-updates.inc
-require conf/distro/include/preferred-xorg-versions-X11R7.4.inc
-
 #avr32 only has patches for binutils 2.17 in OE
 PREFERRED_VERSION_binutils_avr32 = "2.17"
 PREFERRED_VERSION_binutils-cross_avr32 = "2.17"
diff --git a/conf/distro/include/angstrom-2008-preferred-versions.inc b/conf/distro/include/angstrom-2008-preferred-versions.inc
index 3b7905c284..a7c7f4cd58 100644
--- a/conf/distro/include/angstrom-2008-preferred-versions.inc
+++ b/conf/distro/include/angstrom-2008-preferred-versions.inc
@@ -26,5 +26,8 @@ PREFERRED_VERSION_pkgconfig-native = "0.23"
 PREFERRED_VERSION_pulseaudio 	= "0.9.10"
 PREFERRED_VERSION_tiff 		= "3.8.2+4.0.0beta2"
 PREFERRED_VERSION_udev 		= "141"
+PREFERRED_VERSION_util-macros-native = "1.2.1"
+PREFERRED_VERSION_util-macros = "1.2.1"
 PREFERRED_VERSION_wpa-supplicant = "0.6.7"
 PREFERRED_VERSION_xserver-kdrive = "1.4.0.90"
+PREFERRED_VERSION_xserver-xorg = "1.6.1"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 8d2bc93359..4d7c257de2 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -13,7 +13,7 @@
 
 SRCREV_pn-accelges ?= "206"
 SRCREV_pn-aircrack-ng ?= "802"
-SRCREV_pn-alsa-scenario ?= "633aaccc37f845146e490090dbd2a1ebb8064fd6"
+SRCREV_pn-alsa-scenario ?= "8bd7f83d847424eb44704cf1649974b2fda8d8f1"
 SRCREV_pn-app-restarter ?= "4552"
 SRCREV_pn-assassin ?= "268"
 SRCREV_pn-assassin-thumbnail ?= "4690"
diff --git a/conf/machine/at91cap9adk.conf b/conf/machine/at91cap9adk.conf
index 50549dabf6..87311e9be4 100644
--- a/conf/machine/at91cap9adk.conf
+++ b/conf/machine/at91cap9adk.conf
@@ -9,7 +9,6 @@ PREFERRED_VERSION_linux = "2.6.28"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
 KERNEL_IMAGETYPE = "uImage"
-PREFERRED_VERSION_u-boot = "2009.01"
 UBOOT_MACHINE = "at91cap9adk_config"
 
 PREFERRED_VERSION_at91bootstrap = "2.10"
diff --git a/conf/machine/at91sam9260ek.conf b/conf/machine/at91sam9260ek.conf
index 3882c118fb..9a7ca9af62 100644
--- a/conf/machine/at91sam9260ek.conf
+++ b/conf/machine/at91sam9260ek.conf
@@ -10,8 +10,7 @@ PREFERRED_VERSION_linux = "2.6.28"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
 KERNEL_IMAGETYPE = "uImage"
-PREFERRED_VERSION_u-boot = "2009.01"
-UBOOT_MACHINE = "at92sam9260ek_config"
+UBOOT_MACHINE = "at91sam9260ek_config"
 
 PREFERRED_VERSION_at91bootstrap = "2.10"
 
diff --git a/conf/machine/at91sam9261ek.conf b/conf/machine/at91sam9261ek.conf
index a3a9be6dc1..79f275f483 100644
--- a/conf/machine/at91sam9261ek.conf
+++ b/conf/machine/at91sam9261ek.conf
@@ -10,8 +10,7 @@ PREFERRED_VERSION_linux = "2.6.28"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
 KERNEL_IMAGETYPE = "uImage"
-PREFERRED_VERSION_u-boot = "2009.01"
-UBOOT_MACHINE = "at92sam9261ek_config"
+UBOOT_MACHINE = "at91sam9261ek_config"
 
 PREFERRED_VERSION_at91bootstrap = "2.10"
 
diff --git a/conf/machine/at91sam9263ek.conf b/conf/machine/at91sam9263ek.conf
index e633148172..f052170aed 100644
--- a/conf/machine/at91sam9263ek.conf
+++ b/conf/machine/at91sam9263ek.conf
@@ -10,7 +10,6 @@ PREFERRED_VERSION_linux = "2.6.28"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
 KERNEL_IMAGETYPE = "uImage"
-PREFERRED_VERSION_u-boot = "2009.01"
 UBOOT_MACHINE = "at91sam9263ek_config"
 
 PREFERRED_VERSION_at91bootstrap = "2.10"
diff --git a/conf/machine/at91sam9g20ek.conf b/conf/machine/at91sam9g20ek.conf
index 38078b6d03..7dc6ba0d53 100644
--- a/conf/machine/at91sam9g20ek.conf
+++ b/conf/machine/at91sam9g20ek.conf
@@ -9,7 +9,6 @@ PREFERRED_VERSION_linux = "2.6.28"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
 KERNEL_IMAGETYPE = "uImage"
-PREFERRED_VERSION_u-boot = "2009.01"
 UBOOT_MACHINE = "at91sam9g20ek_config"
 
 PREFERRED_VERSION_at91bootstrap = "2.10"
diff --git a/conf/machine/at91sam9rlek.conf b/conf/machine/at91sam9rlek.conf
index ba19cb3e00..f7a78dcf75 100644
--- a/conf/machine/at91sam9rlek.conf
+++ b/conf/machine/at91sam9rlek.conf
@@ -10,8 +10,7 @@ PREFERRED_VERSION_linux = "2.6.28"
 PREFERRED_PROVIDER_xserver = "xserver-kdrive"
 
 KERNEL_IMAGETYPE = "uImage"
-PREFERRED_VERSION_u-boot = "2009.01"
-UBOOT_MACHINE = "at92sam9rlek_config"
+UBOOT_MACHINE = "at91sam9rlek_config"
 
 PREFERRED_VERSION_at91bootstrap = "2.10"
 
diff --git a/conf/machine/include/omap3.inc b/conf/machine/include/omap3.inc
index bb4fa7eaf0..1b47888ab7 100644
--- a/conf/machine/include/omap3.inc
+++ b/conf/machine/include/omap3.inc
@@ -1,7 +1,7 @@
 require conf/machine/include/tune-cortexa8.inc
 PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
 # Increase this everytime you change something in the kernel
-MACHINE_KERNEL_PR = "r34" 
+MACHINE_KERNEL_PR = "r35" 
 
 KERNEL_IMAGETYPE = "uImage"