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

18 files changed, 151 insertions, 62 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index b306034305..c6007aa679 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -258,6 +258,10 @@ sha256=1f8504c7f08d2d59c71a70915fc834a285b99587444ee33e23ee3f135c071da0
 md5=a8cf945d09c6458cb27228218e9a2f45
 sha256=8416e162d6fc921f14a61c8905e9f9a28dc25e67e1c71b75574360a13f0c28c7
 
+[http://downloads.sourceforge.net/fordiac/FORTE-0.3.5.zip]
+md5=d207d3b389ee9f2702df095681459f99
+sha256=2b87b331e931db2db07408c1b07bdb557227e0c16f8fe37f72e40b08fca0a09c
+
 [http://downloads.sourceforge.net/fnorb/Fnorb-1.3.tar.gz]
 md5=7de1500c7ef6592a603890b45e23261b
 sha256=d4380ab7fa8b8a9f564592b4e07c96117abd2d3f677b8a73c824cf4f904aa294
@@ -1110,6 +1114,10 @@ sha256=f4d2ac6f09f44eeb82621530b1970afe88fd97cfe82da43b61069800d0c06d12
 md5=caa9f5bc44232dc8aeea773fea56be80
 sha256=a21d724ab3b3933330194353687df82c475b5dfb997513eef4c25de6c865ec33
 
+[http://downloads.sourceforge.net/amule/aMule-2.1.3.tar.bz2]
+md5=0aafdd159edb8ad5f0064da87998b47d
+sha256=6e97e947bb7ac231b75e3b21a509a2ec0239bcd7e9dbfc6062c520a6d13b0244
+
 [http://heanet.dl.sourceforge.net/amule/aMule-2.1.3.tar.bz2]
 md5=0aafdd159edb8ad5f0064da87998b47d
 sha256=6e97e947bb7ac231b75e3b21a509a2ec0239bcd7e9dbfc6062c520a6d13b0244
@@ -1542,6 +1550,10 @@ sha256=e7d58e2b202713b4df8cd5fd58bc20ba8d31c0da6e5e3b3c89a138dbf0b24ad9
 md5=c66f943203fa24e85ed8c48f6ac5ad1e
 sha256=e7d58e2b202713b4df8cd5fd58bc20ba8d31c0da6e5e3b3c89a138dbf0b24ad9
 
+[ftp://ftp.debian.org/debian/pool/main/a/apt/apt_0.7.20.2.tar.gz]
+md5=e6ee1b594f6ed5fab5cb593ee46cfc21
+sha256=4dc935a520c65705795ada5942b658f6e86b22eefc7032342267272bd6566b05
+
 [ftp://ftp.debian.org/debian/pool/main/a/apt/apt_0.7.3.tar.gz]
 md5=e2e6e23f43bfdf135b923205659dfaf1
 sha256=d3a71446234e567a24740b02abe5bc6c695836343df6139eb7c03ec11871e710
@@ -2466,6 +2478,10 @@ sha256=9e042fcf2d29a58bd60fe3743130095992c62da4c865d01e6fea2d8d6d20583a
 md5=9198f428277693c16c212910996075b4
 sha256=4fe29e8b7c28e6802853867531307704a78f69f37a09d7565268141a2a462644
 
+[http://www.kernel.org/pub/linux/bluetooth/bluez-4.30.tar.gz]
+md5=f6a4b58907a6bec424247ee572d43a2c
+sha256=5a2e6e83062699fb01babfb5b211054e01dde097d3b31767135be5447bb05bde
+
 [http://www.kernel.org/pub/linux/bluetooth/bluez-4.7.tar.gz]
 md5=2aa806940d2c841e57a9b2ab7302b750
 sha256=ed384dea4f5f21157758fcd7db64db19ce0b410509c26630706e4a3c779287a0
@@ -4314,6 +4330,10 @@ sha256=00ca6747501d1b6034398ba5482dcb1e7cf3aff8739fbff0c72e58602d68774c
 md5=0d6b80a1efc3a3d816c4f4175f63eaa2
 sha256=6500f1bc2a30b1f044ebed79c6ce15457d1712263e65f0db7d6046af262ba434
 
+[http://distcc.googlecode.com/files/distcc-3.1.tar.bz2]
+md5=a1a9d3853df7133669fffec2a9aab9f3
+sha256=f55dbafd76bed3ce57e1bbcdab1329227808890d90f4c724fcd2d53f934ddd89
+
 [http://0pointer.de/public/distcc-avahi.patch]
 md5=621dc7dc1e3b9b6770110117df45611a
 sha256=e6651e3de7fee6d953b6ee56732eafa7d4666cb4070db5a925ba071626067c9a
@@ -4482,6 +4502,10 @@ sha256=5287e943265b9efe5bd59cd1f3145d3fbf9e266df28938ad78e2107fde3c1587
 md5=9c1744d32ceed71cbe1db863f64d329d
 sha256=7d27f2389e05b8727c6a7126c0b65d67749c170ba143e648912a88f2fe707bca
 
+[ftp://ftp.debian.org/debian/pool/main/d/dpkg/dpkg_1.14.25.tar.gz]
+md5=6bf3504b07d8fe2175a5d794391280de
+sha256=545ce9830f0cf649e3b1b40d25d13989c23302623bf9b50f4c24402f63c82184
+
 [http://xorg.freedesktop.org/releases/individual/proto/dri2proto-1.1.tar.bz2]
 md5=1d70f0653b0b3a837853262dc5d34da4
 sha256=69def6d1f64b3699ec9c729596d8b096623a62bdda6bbea78ed690421d174c11
@@ -5574,6 +5598,10 @@ sha256=facba5a97a20ca92b32504174474775c6b12fb67a6f646fa0de18db709c3edde
 md5=ee34788a2dc9fdc088a6dc66c31eba34
 sha256=c789b355d0ba03b018513c3904bba6d6fab01b3a83a460fbe1b20a79052f46a4
 
+[http://members.cheese.at/woody/zaurus/src/fltk-chess-0.51.tgz]
+md5=df1f73bdf32f30923d9a2a5717a70913
+sha256=3fffcaf0653c13b249931f76b12119dce8a5b01df056e4b5444f150fec1d5311
+
 [http://savannah.nongnu.org/download/fluid/fluidsynth-1.0.8.tar.gz]
 md5=e2abfd2e69fd8b28d965df968d7d44ee
 sha256=45e7c9967d0fb0344f4da539ab343fb979384b36a429a8594c94cf466dff4320
@@ -5974,6 +6002,10 @@ sha256=3feaaab499b3f9c7e9b8bdc725dd40fde65b2fbb73794845d7f682746470f594
 md5=89b65e010acaa3c5d370e1cc0ea9fce9
 sha256=77fb4d23dfa8c12d69ccfda71f482af9804132fab800610970cd5fe9944a3016
 
+[http://kent.dl.sourceforge.net/sourceforge/fordiac/forte-0.3.zip]
+md5=2d01a3d3b9b16bf646e6bb89cb9b0faf
+sha256=c3a61174f6a69252983a9b26ea87005bcab6a72b0bd34ea693e3de89e70eaea6
+
 [ftp://ftp.debian.org/debian/pool/main/f/fortune-mod/fortune-mod_1.99.1-2.diff.gz]
 md5=5f059f7c997adbc0a260f27947605be1
 sha256=d68c7c8ff6fe94341a3a73d22ab976da42921e3bec9bed628a428518c2c5f67a
@@ -7222,6 +7254,10 @@ sha256=cacf881ccdbc3fe5568636bf279392b5d339a481a5fb2c03d5c70a2de58f7407
 md5=dbbb1880feb8b9c2493ece670520299b
 sha256=7b47fd0d2e5a2f2d626b3e9e903ff8a0c0ce7c926925944dcea1f9ca3e6cfda1
 
+[http://downloads.sourceforge.net/musicpd/gmpc-0.17.96.tar.gz]
+md5=8876ca25ae70a379b62b6b407dc4f5ba
+sha256=c04149c5ea4325bf63a847649d9ae5e0ed9b3b6b1804856753b756782e02329c
+
 [http://downloads.sourceforge.net/gmpy/gmpy-sources-101.zip]
 md5=7b2e951912d4bee9613c35244ca32673
 sha256=5cd061fa5d4906d6aa7183393c98d070dc689cbb946c13bebab6d6e4ecdc2231
@@ -7562,6 +7598,10 @@ sha256=417922d35e66ee90cf93cf3e93fdf281ec6b92de4f7436c9c1a97c0cc35b94a8
 md5=008820142c414517512ab0ad3e036c8b
 sha256=d97ee0f1c45e1bfa880305a33e7e0ef695927094adce100cc76a76a0f57ef789
 
+[http://members.cheese.at/woody/fltk-chess/gnuchess_5.02.tar.gz]
+md5=01a9e1dc12613543f10ca3bc09acc0af
+sha256=64483bf3e98124e3490509a6054da0ff70b69ca0baa04f53444d7cf054deee06
+
 [http://ftp.gnome.org/pub/GNOME/sources/gnumeric/1.6/gnumeric-1.6.3.tar.bz2]
 md5=78ffd75ae6abc3bb20dd04407a082a26
 sha256=badaa6899f71ef112515ce81aee02e559e18b5fa87c7f2262390764aaf9b1dc0
@@ -8774,6 +8814,10 @@ sha256=aa3d5ce29232ee5b24b6c032194ac1fc757309ea50ac850c0db46e45ab0a78ff
 md5=0e0cd485311502ad1c0c028148e3186a
 sha256=673f4a45a0f3aa99606a58097bde02d09ad51d7b2e702f0d68eeb6db21d47e93
 
+[http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.22.tar.bz2]
+md5=5d0f1e07f8f6db564971b50f75261e8a
+sha256=184c5aed03ebfe38a276fc03cb7d8685d9a6da5a48bf6a0565c83e11a29cd5f9
+
 [http://gstreamer.freedesktop.org/src/gst-plugins-base/gst-plugins-base-0.10.5.tar.bz2]
 md5=2b5958fb0baaf8d1b4eae18f7b13d49b
 sha256=fe2fb4fe446a1d3f8ccd4284ae7ffd25cb9f1b836b3d0e29d2494d10c1ae3eac
@@ -8794,6 +8838,10 @@ sha256=623e187f87037a690b5d0beef5991b3f2a58bb5058fad8c75329f48f0b07da4b
 md5=79b086c2dc0e07ae0c8ddc91512bab3a
 sha256=05323f065080e3df5f5c9cadceca977598ba106b3eebf2bbec46099becf796b1
 
+[http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.13.tar.bz2]
+md5=27f27151ccefad1157c9eaa322e14ac4
+sha256=dfffb80ef01b8fee9af3576311e65b60c378d9985099dea532be090ede54ebaa
+
 [http://gstreamer.freedesktop.org/src/gst-plugins-good/gst-plugins-good-0.10.2.tar.bz2]
 md5=03d3d0b5f19014fe0065234a3ea65ee6
 sha256=dd92993d08930cca071893b5d3f5cb40a4498f3ddaf12da98c0bbe8c27605e81
@@ -8890,6 +8938,10 @@ sha256=c839c3872510890bdbdfb43a79fd8b5646f3b9164b637127fb550351dc147eba
 md5=7bad90af3fd81a1535363cf85359125c
 sha256=94c185a0452b5fcddb538f6b686ff959b7afca8340c48fdbe47c87a2a459c3d3
 
+[http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.22.tar.bz2]
+md5=35dd8598837af4074753afe5b59e8ef2
+sha256=61489e0192b1362e6dc760154204c73c1edd9ad9d8c754535483ec00ad7e389e
+
 [http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-0.10.4.tar.bz2]
 md5=263a7800ecf44d0f38d0cbc80bce65ff
 sha256=7b8add7db1e0b0e3671f374469ef32b151fa96bc9eb2aa265eefd79548752ffc
@@ -12554,6 +12606,10 @@ sha256=ef2269cc4ba5c8574d38321349d76063c6b200857f0c9256ea97e608583e8857
 md5=7f7a060e83b4278acf4b77d7a7b9d2c0
 sha256=4bd54929a80850754f27b568d7891e1e3e1b8d2f208d371f27d1fda09e6f12a8
 
+[http://downloads.sourceforge.net/musicpd/libmpd-0.17.96.tar.gz]
+md5=dfbe478c4d4e9bf8e450c7349e104e2a
+sha256=f7e11c6137a1628d63985799ebcb78577832fca3ca4aeb2fc53d0e667cf699c0
+
 [http://www2.autistici.org/bakunin/libmrss/libmrss-0.17.2.tar.gz]
 md5=54935c6cff42df2f1daada267b701392
 sha256=18f0e2df191219c29b47dc12b4b06b5be7eaeef34b3436156547e5a9f4eb51c1
@@ -13902,6 +13958,10 @@ sha256=5c7226b4c65b8420960eea372547b29236df3757d005bc1d7912b44b978d5669
 md5=d351e44709c9810b85e29b877f50968a
 sha256=ae0d97c55efe7fce01273c97f8152af0deff5541e3bbf5b9ad98689112b54380
 
+[http://kernel.org/pub/linux/kernel/v2.6/testing/linux-2.6.28.tar.bz2]
+md5=d351e44709c9810b85e29b877f50968a
+sha256=ae0d97c55efe7fce01273c97f8152af0deff5541e3bbf5b9ad98689112b54380
+
 [http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.9.tar.bz2]
 md5=e921200f074ca97184e150ef5a4af825
 sha256=f5dba6366e87e91234d1b0069cfea655b0a4cb37ea97f899226f16998e6ab9f1
@@ -14938,6 +14998,10 @@ sha256=7861535eef2c0804dbdc6993db76574b4a812164bed7545a3697a3b97e36d2dd
 md5=5169ead6783f374cedf3f89bf399bd75
 sha256=a966641cf1b6e18e4f58aa3585a9a63905ed50252883804c006a3263674a32ec
 
+[http://git.xfce.org/kalikiana/midori/snapshot/midori-f30dff433056e239ca775d16f343bdb249f1a338.tar.bz2]
+md5=24f6c176246300b66c036de65fed0565
+sha256=6151809d337ea8d07769618acd4ac470c5ccd310790e40805b93cf8781904048
+
 [http://downloads.sourceforge.net/midpath/midpath-0.3rc2.tar.gz]
 md5=d03cd88f51f82bbcfcfa5b65df0da5b0
 sha256=e235ca7470e7cdfb90e3806fbcc1b2c450db286276136a2523c7ae26a804a100
@@ -15318,6 +15382,10 @@ sha256=55bdff5fefa619682c4da7cf25c8e1281f21f405e98580b24d3cfb7ff781a87d
 md5=a93a390315aacfec061c8df89fb5e35f
 sha256=76e151048a736cf490630ace4909f2d4b65f1afe2447c7fd794d270eb956e045
 
+[http://downloads.sourceforge.net/musicpd/mpc-0.15.tar.bz2]
+md5=48897aeb3a7ee5c64f30e56789f105a8
+sha256=7b549ca4af77fc5b0472df1ecd9e76d2f8415258ddcfb63dfa64a55a04e1e590
+
 [http://downloads.sourceforge.net/musicpd/mpd-0.11.2.tar.gz]
 md5=b6e913dc4b63b161bb1b96030763c3a7
 sha256=e784f78b3cce93367c105619c690465b78a88d3e4c616cc829f4cb5e66f2bbe0
@@ -15330,6 +15398,10 @@ sha256=30e454514ef84f65162182b7cbcd0e46fdda4c99111ac500b5b2df7678ca10fd
 md5=1a9a1a9d31f00a43838b3752024f7ebe
 sha256=30e454514ef84f65162182b7cbcd0e46fdda4c99111ac500b5b2df7678ca10fd
 
+[http://downloads.sourceforge.net/musicpd/mpd-0.14.2.tar.bz2]
+md5=66817a4b4c05454e6488f6b821f2a6a3
+sha256=0b3926a141873f179efc3c3b9d296b65d332dbb898340ac5e5d1dd0c3dd9fb20
+
 [http://libmpeg2.sourceforge.net/files/mpeg2dec-0.4.0b.tar.gz]
 md5=52d10ea80595ec83d8557ba7ac6dc8e6
 sha256=9416376952812e5b479745d67a2bf874fbcad10137517314ce7de37abb756df8
@@ -15674,6 +15746,10 @@ sha256=76472e51576b42bfc129e487ae7dd3a5e1f1f380105b422fc14ee408e3a881df
 md5=516c576c0ca5c0a01ad24d018093cfee
 sha256=8a29457052b73ac0139e3b2824a74323256dd7631b1691239ddb18124e231a71
 
+[http://www.webdav.org/neon/neon-0.28.2.tar.gz]
+md5=b99b3f44e8507ae2d17362f1b34aaf02
+sha256=d9cd601613db6affb25655e0908b0bf8c266669cef31999b6b4121d585ff9094
+
 [http://downloads.sourceforge.net/net-snmp/net-snmp-5.1.2.tar.gz]
 md5=8080555ab3f90011f25d5122042d9a8d
 sha256=1fca69e934c3d526e308450cc5af2478d440e012922dd0bb10388fcf093ef32e
@@ -16938,6 +17014,10 @@ sha256=fbb5ee21210a4e4e1fe25941c6e16ec0fe8634817e6c96145128f376ba0c640b
 md5=464f663266e2c18371e213adab3c0077
 sha256=4862e7bf53553f645d9d730d3657bbec79f7c03482a984259b38e10e25b54382
 
+[http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.29-rc5.bz2]
+md5=60193569887cb6fe98b9c0d483f911e7
+sha256=e5ad0ec9b0facaab5982a0d48534292e6d3a6a3e6dca60e798e8b8eeda2f8a8e
+
 [http://www.muru.com/linux/omap/patches/patch-2.6.9-omap1.bz2]
 md5=d6249654087f0bcafaa860ac573316a4
 sha256=91806347cb386002a8bfd20ee66e536e4a7dfb01f207dd751341f2971090d9ac
@@ -20290,6 +20370,10 @@ sha256=8260a2d3a67c5cebc100e7662f81679582c0f05a2a28260e235bdf051e72aee3
 md5=4c333a5fe827568c67d195cda7a5e154
 sha256=763b8c9c16c03adc3ad00ccf1b5b47a08b5ffe94e499d3c87bb02acbc1026b53
 
+[http://subversion.tigris.org/downloads/subversion-1.5.5.tar.bz2]
+md5=6f3701a0f2acf3fe53093491ba3d77ee
+sha256=88cf24ba5d589351791709ff7556ababc019ec59f3240ac2087dacabb9ad77be
+
 [http://ftp.sudo.ws/sudo/dist/sudo-1.6.8p12.tar.gz]
 md5=b29893c06192df6230dd5f340f3badf5
 sha256=56f7d86032538a4a98d90af3742903a09ba16d6db82b593e4a47605f87fa581a
@@ -22226,6 +22310,10 @@ sha256=1e09f6ad9dd987403f9549c2640680cf932ba00df5afa20a4531e98544b413a5
 md5=029ff5aac16ff5c42c89b9a7c7ac4029
 sha256=7c03f8e02b023c8843bc959bf32d972cdca27d5f6601c6c2ce1c1174208966d4
 
+[http://downloads.sourceforge.net/wxwindows/wxBase-2.6.4.tar.bz2]
+md5=6e55324d2a522d23fd8834ad8656e0b6
+sha256=1679c29f94983f3fb855f79dcffa2335eb638c6e159444185506e0ff50e6672a
+
 [http://heanet.dl.sourceforge.net/wxwindows/wxBase-2.6.4.tar.bz2]
 md5=6e55324d2a522d23fd8834ad8656e0b6
 sha256=1679c29f94983f3fb855f79dcffa2335eb638c6e159444185506e0ff50e6672a
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index 6cbd032259..f78c804203 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -1840,7 +1840,7 @@ PREFERRED_VERSION_thunar ?= "0.8.0"
 PREFERRED_VERSION_thunderbird ?= "1.0.7"
 PREFERRED_VERSION_tickypip ?= "0.1.2"
 PREFERRED_VERSION_tickypip-levels ?= "1.1"
-PREFERRED_VERSION_tiff ?= "3.7.2"
+PREFERRED_VERSION_tiff ?= "3.8.2"
 PREFERRED_VERSION_tightvnc ?= "1.3dev7"
 PREFERRED_VERSION_tiinit ?= "3.2.26"
 PREFERRED_VERSION_time ?= "1.7"
@@ -1932,7 +1932,7 @@ PREFERRED_VERSION_util-macros ?= "1.1.5"
 PREFERRED_VERSION_util-macros-native ?= "1.1.5"
 PREFERRED_VERSION_uucp ?= "1.07"
 PREFERRED_VERSION_v4l2apps ?= "20020317"
-PREFERRED_VERSION_vala ?= "0.5.1"
+PREFERRED_VERSION_vala ?= "0.5.6"
 PREFERRED_VERSION_vala-native ?= "0.5.6"
 PREFERRED_VERSION_vde ?= "2.0.2"
 PREFERRED_VERSION_vectoroids ?= "1.1.0"
diff --git a/conf/distro/include/preferred-slugos-versions.inc b/conf/distro/include/preferred-slugos-versions.inc
index 1c69b14fa6..d495930b20 100644
--- a/conf/distro/include/preferred-slugos-versions.inc
+++ b/conf/distro/include/preferred-slugos-versions.inc
@@ -63,6 +63,14 @@ PREFERRED_VERSION_udev				?= "118"
 
 ##################### Stuff with special notes, and broken stuff:
 
+# libtool/pkgconfig victims -- these packages are locked down because
+# newer versions also require newer libtool/pkgconfig versions.
+
+PREFERRED_VERSION_avahi				?= "0.6.23"
+PREFERRED_VERSION_gst-plugins-base		?= "0.10.17"
+PREFERRED_VERSION_tiff				?= "3.7.2"
+
+
 # Hack alert - selecting this version of libusb effectively selects
 # the use of libusb1 and libusb-compat in the case that something
 # still depends on libusb. This is required because otherwise
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 15baf2b144..4f87639586 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -57,11 +57,11 @@ SRCREV_pn-flashrom ?= "3682"
 SRCREV_pn-frameworkd ?= "700ab8250582767628165b7cf6f671ef756ba56d"
 SRCREV_pn-frameworkd-devel ?= "${SRCREV_pn-frameworkd}"
 SRCREV_pn-fsod ?= "3fa5eb6f2edcf7c9f0fc2027fda47b91d9f0f136"
-SRCREV_pn-fso-abyss ?= "09fd818470bb0da3b7614804f5141be52e0942c1"
+SRCREV_pn-fso-abyss ?= "1af4f7914c84e050b3b409634c5e7ef70d5d6544"
 SRCREV_pn-fso-apm ?= "eb39ce7fb81bfa64e1a9eb5f142ca3d1065be3fa"
 SRCREV_pn-fso-gpsd ?= "78fe48dffb923175bde9f0aabc3500a9264a57e0"
 SRCREV_pn-fso-gsm0710muxd ?= "abcbcd7cc532a8834906de3fc24c8f8fe7643cd4"
-SRCREV_pn-fso-monitord ?= "6a7860dc09a18144e8e363e64b2eb881bba83728"
+SRCREV_pn-fso-monitord ?= "0f64979a11d6263c7b7ed0e945a0889744f295f1"
 SRCREV_pn-fso-sounds ?= "3d2cf5231cb0e81770a246530574142bd2b8bbff"
 SRCREV_pn-fstests ?= "204"
 SRCREV_pn-gconf-dbus ?= "641"
@@ -84,7 +84,7 @@ SRCREV_pn-libexalt-dbus ?= "76"
 SRCREV_pn-libfakekey ?= "1455"
 SRCREV_pn-libframeworkd-glib ?= "e90f7c208356b53c34e025585248ea0a7a2ea13c"
 SRCREV_pn-libgdbus ?= "aeab6e3c0185b271ca343b439470491b99cc587f"
-SRCREV_pn-libgsm0710 ?= "a05704a56003dc02dca784cef4176e97eaf9f688"
+SRCREV_pn-libgsm0710 ?= "243ef1b0db523a1ff163803e8277dc02e7c7b0b8"
 SRCREV_pn-libgsmd ?= "4505"
 SRCREV_pn-libiac ?= "1590"
 SRCREV_pn-libjana ?= "713"
@@ -116,6 +116,7 @@ SRCREV_pn-matchbox-panel-2 ?= "1626"
 SRCREV_pn-matchbox-stroke ?= "1820"
 SRCREV_pn-mickeydbus ?= "f894801916cc4d0e912e4553490dc215276c52a9"
 SRCREV_pn-mickeyterm ?= "f894801916cc4d0e912e4553490dc215276c52a9"
+SRCREV_pn-midori ?= "f30dff433056e239ca775d16f343bdb249f1a338"
 SRCREV_pn-moblin-proto ?= "8f2cb524fe06555182c25b4ba3202d7b368ac0ce"
 SRCREV_pn-moko-gtk-engine ?= "4734"
 SRCREV_pn-mokoko ?= "127"
@@ -245,7 +246,7 @@ SRCREV_pn-zhone ?= "f38cc52fbf11f7fe945797a6b8ade29ed479d924"
 # Enlightenment Foundation Libraries
 # Caution: This is not alphabetically, but (roughly) dependency-sorted.
 # Please leave it like that.
-EFL_SRCREV ?= "38544"
+EFL_SRCREV ?= "39089"
 SRCREV_pn-edb-native ?= "${EFL_SRCREV}"
 SRCREV_pn-edb ?= "${EFL_SRCREV}"
 SRCREV_pn-eina-native ?= "${EFL_SRCREV}"
diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc
index 0f88755f8d..40c9f9e557 100644
--- a/conf/distro/include/slugos.inc
+++ b/conf/distro/include/slugos.inc
@@ -16,7 +16,7 @@
 #TARGET_OS "linux" or "linux-uclibc"
 
 # The following may be overridden to make sub-versions
-SLUGOS_VERSION = "5.2"
+SLUGOS_VERSION = "5.3"
 DISTRO_REVISION ?= ""
 DISTRO_VERSION ?= "${SLUGOS_VERSION}${DISTRO_REVISION}-${DISTRO_TYPE}"
 # For release (only):
diff --git a/conf/distro/kaeilos.conf b/conf/distro/kaeilos.conf
index fac86c8667..a65bbff2c8 100644
--- a/conf/distro/kaeilos.conf
+++ b/conf/distro/kaeilos.conf
@@ -21,7 +21,7 @@ require conf/distro/include/preferred-opie-versions-1.2.4.inc
 PREFERRED_VERSION_xserver-kdrive = "1.3.0.0"
 PREFERRED_VERSION_busybox        = "1.13.2"
 
-DISTRO_DEV_MANAGER = "busybox-mdev"
+IMAGE_DEV_MANAGER = "busybox-mdev"
 
 #Images built can have to modes:
 # 'debug': empty rootpassword, strace included
diff --git a/conf/distro/openmoko.conf b/conf/distro/openmoko.conf
index c038096231..cb1513de4b 100644
--- a/conf/distro/openmoko.conf
+++ b/conf/distro/openmoko.conf
@@ -30,7 +30,7 @@ DISTRO_FEED_URI ?= "http://downloads.openmoko.org/repository/testing"
 AB_DEPLOY_EXTRA ?= ""
 DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE_ARCH}/${AB_DEPLOY_EXTRA}"
 
-DISTRO_INITSCRIPTS = "initscripts-openmoko"
+IMAGE_INITSCRIPTS = "initscripts-openmoko"
 
 # We try to minimize the distro features in the default image.
 DISTRO_FEATURES = "wifi ppp alsa ext2 vfat usbhost"
diff --git a/conf/distro/openprotium.conf b/conf/distro/openprotium.conf
index b794d4a4ec..633e3bcaef 100644
--- a/conf/distro/openprotium.conf
+++ b/conf/distro/openprotium.conf
@@ -8,10 +8,10 @@ TARGET_OS = "linux"
 #
 # Basic configuration
 #
-DISTRO_DEV_MANAGER = "udev"
+IMAGE_DEV_MANAGER = "udev"
 DISTRO_SSH_DAEMON = "dropbear"
-DISTRO_INIT_MANAGER = "sysvinit"
-DISTRO_LOGIN_MANAGER = "tinylogin"
+IMAGE_INIT_MANAGER = "sysvinit"
+IMAGE_LOGIN_MANAGER = "tinylogin"
 MACHINE_TASK_PROVIDER = "task-openprotium"
 
 #
diff --git a/conf/machine/htcdiamond.conf b/conf/machine/htcdiamond.conf
index e4b07ea794..f4d3874e7b 100644
--- a/conf/machine/htcdiamond.conf
+++ b/conf/machine/htcdiamond.conf
@@ -1,15 +1,10 @@
 #@TYPE: Machine
-#@NAME: HTC Diamond phone
-#@DESCRIPTION: Machine configuration for HTC Diamond phone
-require conf/machine/include/tune-arm1136-novfp.inc
+#@NAME: HTC Diamond
+#@DESCRIPTION: Machine configuration for the HTC Diamond smartphone
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-msm7xxxx"
+require conf/machine/include/htc-msm7.inc
 
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
-XSERVER = "xserver-kdrive-fbdev"
 MACHINE_DISPLAY_WIDTH_PIXELS = "480"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
 
 MACHINE_FEATURES = "kernel26 touchscreen screen phone gps usb"
-
-IMAGE_FSTYPES += "tar.gz cpio.gz"
diff --git a/conf/machine/htckaiser.conf b/conf/machine/htckaiser.conf
index c977ba2eb6..29e33519c7 100644
--- a/conf/machine/htckaiser.conf
+++ b/conf/machine/htckaiser.conf
@@ -1,15 +1,10 @@
 #@TYPE: Machine
-#@NAME: HTC Kaiser phone
-#@DESCRIPTION: Machine configuration for HTC Kaiser phone (aka HTC TyTN II)
-require conf/machine/include/tune-arm1136-novfp.inc
+#@NAME: HTC Kaiser
+#@DESCRIPTION: Machine configuration for the HTC Kaiser smartphone (aka HTC TyTN II)
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-msm7xxxx"
+require conf/machine/include/htc-msm7.inc
 
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
-XSERVER = "xserver-kdrive-fbdev"
 MACHINE_DISPLAY_WIDTH_PIXELS = "240"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
 
 MACHINE_FEATURES = "kernel26 touchscreen screen keyboard phone gps"
-
-IMAGE_FSTYPES += "tar.gz cpio.gz"
diff --git a/conf/machine/htcpolaris.conf b/conf/machine/htcpolaris.conf
index 0afc65a198..1473fa4a34 100644
--- a/conf/machine/htcpolaris.conf
+++ b/conf/machine/htcpolaris.conf
@@ -1,15 +1,10 @@
 #@TYPE: Machine
-#@NAME: HTC Polaris phone
-#@DESCRIPTION: Machine configuration for HTC Polaris phone
-require conf/machine/include/tune-arm1136-novfp.inc
+#@NAME: HTC Polaris
+#@DESCRIPTION: Machine configuration for the HTC Polaris smartphone
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-msm7xxxx"
+require conf/machine/include/htc-msm7.inc
 
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
-XSERVER = "xserver-kdrive-fbdev"
 MACHINE_DISPLAY_WIDTH_PIXELS = "240"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
 
 MACHINE_FEATURES = "kernel26 touchscreen screen phone gps"
-
-IMAGE_FSTYPES += "tar.gz cpio.gz"
diff --git a/conf/machine/htcraphael.conf b/conf/machine/htcraphael.conf
index ad4329714d..b9aa609bf1 100644
--- a/conf/machine/htcraphael.conf
+++ b/conf/machine/htcraphael.conf
@@ -1,15 +1,10 @@
 #@TYPE: Machine
-#@NAME: HTC Raphael phone
-#@DESCRIPTION: Machine configuration for HTC Raphael phone (aka HTC Touch Pro)
-require conf/machine/include/tune-arm1136-novfp.inc
+#@NAME: HTC Raphael
+#@DESCRIPTION: Machine configuration for HTC Raphael smartphone (aka HTC Touch Pro)
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-msm7xxxx"
+require conf/machine/include/htc-msm7.inc
 
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
-XSERVER = "xserver-kdrive-fbdev"
 MACHINE_DISPLAY_WIDTH_PIXELS = "480"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
 
 MACHINE_FEATURES = "kernel26 touchscreen screen phone gps usb keyboard"
-
-IMAGE_FSTYPES += "tar.gz cpio.gz"
diff --git a/conf/machine/htctitan.conf b/conf/machine/htctitan.conf
index 2882f8d4d7..bcd4ab8795 100644
--- a/conf/machine/htctitan.conf
+++ b/conf/machine/htctitan.conf
@@ -1,15 +1,10 @@
 #@TYPE: Machine
 #@NAME: HTC Titan phone
-#@DESCRIPTION: Machine configuration for HTC Titan phone
-require conf/machine/include/tune-arm1136-novfp.inc
+#@DESCRIPTION: Machine configuration for HTC Titan smartphone
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-msm7xxxx"
+require conf/machine/include/htc-msm7.inc
 
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
-XSERVER = "xserver-kdrive-fbdev"
 MACHINE_DISPLAY_WIDTH_PIXELS = "240"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
 
 MACHINE_FEATURES = "kernel26 touchscreen screen phone gps camera keyboard"
-
-IMAGE_FSTYPES += "tar.gz cpio.gz"
diff --git a/conf/machine/htcvogue.conf b/conf/machine/htcvogue.conf
index 7bf0f6d0b8..c0670024a4 100644
--- a/conf/machine/htcvogue.conf
+++ b/conf/machine/htcvogue.conf
@@ -1,15 +1,10 @@
 #@TYPE: Machine
-#@NAME: HTC Vogue phone
-#@DESCRIPTION: Machine configuration for HTC Vogue phone
-require conf/machine/include/tune-arm1136-novfp.inc
+#@NAME: HTC Vogue
+#@DESCRIPTION: Machine configuration for HTC Vogue smartphone
 
-PREFERRED_PROVIDER_virtual/kernel = "linux-msm7xxxx"
+require conf/machine/include/htc-msm7.inc
 
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
-XSERVER = "xserver-kdrive-fbdev"
 MACHINE_DISPLAY_WIDTH_PIXELS = "240"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "320"
 
 MACHINE_FEATURES = "kernel26 touchscreen screen phone gps camera"
-
-IMAGE_FSTYPES += "tar.gz cpio.gz"
diff --git a/conf/machine/include/htc-msm7.inc b/conf/machine/include/htc-msm7.inc
new file mode 100644
index 0000000000..3b26e0be35
--- /dev/null
+++ b/conf/machine/include/htc-msm7.inc
@@ -0,0 +1,23 @@
+# kernel
+PREFERRED_PROVIDER_virtual/kernel = "linux-msm7xxxx"
+
+# xserver
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+XSERVER = "xserver-kdrive-fbdev"
+
+# capability database
+MACHINE_DISPLAY_WIDTH_PIXELS = "480"
+MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
+
+# use this for overrides
+MACHINE_CLASS = "htc-msm7"
+
+# features
+MACHINE_FEATURES = "kernel26 touchscreen screen phone gps usb keyboard"
+
+# filesystems
+IMAGE_FSTYPES = "tar.gz cpio.gz"
+
+# CPU
+require conf/machine/include/tune-arm1136-novfp.inc
+
diff --git a/conf/machine/mx31moboard.conf b/conf/machine/mx31moboard.conf
index a00a9b1be3..a1a5212ee9 100644
--- a/conf/machine/mx31moboard.conf
+++ b/conf/machine/mx31moboard.conf
@@ -20,7 +20,7 @@ module_conf_g_ether = "alias usb0 g_ether"
 module_conf_rt2570-k2wrlz = "alias rausb0 rt2570"
 
 # tinylogin is broken for our speeds
-DISTRO_LOGIN_MANAGER = "busybox"
+IMAGE_LOGIN_MANAGER = "busybox"
 
 # used by sysvinit_2
 SERIAL_CONSOLE = "-Lh 921600 ttymxc0 vt100"
diff --git a/conf/machine/om-gta03.conf b/conf/machine/om-gta03.conf
index 3bbb21e5e6..f135178652 100644
--- a/conf/machine/om-gta03.conf
+++ b/conf/machine/om-gta03.conf
@@ -6,7 +6,7 @@
 
 TARGET_ARCH = "arm"
 
-PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-2.6.28"
+PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-devel"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
 
 MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost phone vfat ext2"
diff --git a/conf/machine/vortex86sx.conf b/conf/machine/vortex86sx.conf
index 4595b6aebe..b2a116d109 100644
--- a/conf/machine/vortex86sx.conf
+++ b/conf/machine/vortex86sx.conf
@@ -4,7 +4,6 @@
 require conf/machine/include/tune-i486sx.inc
 
 MACHINE_FEATURES += "x86"
-MACHINE_EXTRA_RRECOMMENDS = "kernel-module-uvesafb v86d"
 
 KERNEL_IMAGETYPE = "bzImage"