merge of '31de530bc2ccfc10a0020cfb5eab126481380149'

     and 'b972704167f6ef738f541485ce27cba47e88e225'

2 files changed, 172 insertions, 6 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 59a67cfe20..6c63dff5d7 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -1134,6 +1134,30 @@ sha256=926a9115e5c885ff9f2ef8abc6c3c552652afc370ebf65a87f41ec6810bdb569
 md5=3cec33c3711860c4c6b7614afeec7870
 sha256=9d7abee640dafbcdc6b75544015f3ffb5ed5aed2747465ec1412e959d3966740
 
+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-034]
+md5=7bc6c5b5f38b7027152f8db0458a2e14
+sha256=adc52e3427b606fe9649980b01c5b2b18f0509c4dd6d59a84f85b6a2989f9f8e
+
+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-035]
+md5=a2db61fe90e39371d0e6cd2285ec9208
+sha256=d3d906b23fce195d5d6f0db8969fa5264e80a98b5460008d6a05e4156ca73953
+
+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-036]
+md5=95c70c7ae9de5bd3659c86284be7fb76
+sha256=bdb24d65d1170234379fe587f5dc8b990c5e0c2d61c394bb8c81b91c1c64ce23
+
+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-037]
+md5=62b876a3d7cd192cc8db2476fbb6b7b9
+sha256=9688a352c0fb23d2ce6e685ce39cda1c49f4aa7819bde2508ff8c90003f484df
+
+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-038]
+md5=aca3afc341bd3e5a0d8a3b4ca40dbb3f
+sha256=0e3649531c3a5675743980ecf5ff5fcbca2801afe4dca7fb4b250aae7ac3b782
+
+[http://ftp.gnu.org/gnu/bash/bash-3.2-patches/bash32-039]
+md5=e240c34f979b64bcb83c5f6567110bb1
+sha256=46d427fd5b1509ec7dd980c07efd88634fde61cf07ab221dcbde9e1021bd2817
+
 [http://bazaar.canonical.com/releases/src/bazaar_1.2.tar.gz]
 md5=1fdb0aa41d7db06bf3429118d0136c8a
 sha256=d1b657f52dea785ce1b1a8b5acfdee4492c5d779422f9b58e145162e2d33c241
@@ -1726,6 +1750,10 @@ sha256=c91699fe8cd2140e3b236257e7cb5ca4cd42e587a8f3eb932363f82f0e7212ef
 md5=fb891b3da7eb921c09a5eb93e296f5e1
 sha256=e9c6feee2a626a38cd69c726ed31ffbbf55d288386f50fe6f90fa63de410d67a
 
+[http://www.call-with-current-continuation.org/chicken-2.6.tar.gz]
+md5=332edae079bb34d815369f4ba5181983
+sha256=32385c5393c7376035f911f3e887351b1ce8fb6e56498cc4258815bc6db06326
+
 [http://www.chillispot.org/download/chillispot-0.98.tar.gz]
 md5=4bcf48ec7a94f28faee8b7dc7a0dd97a
 sha256=bace8a6a0b27d09983a2c509d6e6bf8ab786935e269036f14dc158505feba602
@@ -1818,6 +1846,10 @@ sha256=2fd5feb294b933ae3a0071b8c7a396797cf79dfe6b0ffeff8788e07ff4107d56
 md5=f5dd061c31765a49dc17ae8bdc986779
 sha256=f20607d4f33376ea648307681630574662d0c3f59d88a7a02ad547b6320631f1
 
+[http://www.cmake.org/files/v2.6/cmake-2.6.0.tar.gz]
+md5=e95ae003672dfc6c8151a1ee49a0d4a6
+sha256=4999d3054a04e6cf4847a72316e32e9e98e6152b1fd72adc87d15e305f990f27
+
 [http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches/collie-kexec.patch]
 md5=97cdbeb23bc8c8f4fe563d10a0c8c110
 sha256=2e5488039040e76bdedb08323f729a0ef0549d23b35bb740f541c960393ec378
@@ -1894,6 +1926,10 @@ sha256=44549dcc5aa1aff1c62d0cf2a86412468f1498ecd3e846d278552ee50662242d
 md5=dbcff54980ec6d6203c290dc409b5598
 sha256=7ab8f1fa23a432029242c046755875ac6558ea6e9c0871dd6c527b85adfafad8
 
+[http://pimlico-project.org/sources/contacts/contacts-0.9.tar.gz]
+md5=aab5affbf93d6fa7b978b323a8d44de0
+sha256=9cacec98f8123993033aaa255f3f4c04c86a1be65e487dd21f0aaa54384a6f6d
+
 [ftp://ftp.gnu.org/gnu/coreutils/coreutils-5.0.tar.gz]
 md5=d16b769d380a0492a4c5ee61d2619985
 sha256=c27ce75e3f62455f4facf4f3fd55bc9e3877d0ab1d5c0426c94da168cc349883
@@ -2194,6 +2230,10 @@ sha256=bc80a1933a77fc4cb47716d06aec3c2181976879ba771888af8b644086f24210
 md5=0923d825a0aff2e4eb23338b630286fb
 sha256=e870d8cd619834eda066e37fe69b441d629f9ad3a871ef2854fbbcd753b3abe2
 
+[http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-0.76.tar.gz]
+md5=d3b716a7e798faa1c6a867675f00306a
+sha256=8bc083faaf3efdd444a8a44bbcbfea501a7b547736fda3c2d83bfdc9b5b672a3
+
 [http://dbus.freedesktop.org/releases/dbus-python/dbus-python-0.71.tar.gz]
 md5=ee893bc87b784a8c2285f5041b5e7033
 sha256=4af7a60f65cb02dabbcdf0cb6ca6f659932eb13c2533f6e1dbdab6e3700a2c57
@@ -4122,6 +4162,14 @@ sha256=885b22a93b97116cd69824b91905dd909828943d78de069508a56cdf0d8d9203
 md5=90fb4b7c74d29bb6ee5bd8de85942f42
 sha256=cbb0e76c28a8b8ee93d49e1fea4cb31549904d95cd8f488309126f7f5046d616
 
+[ftp://ftp.gnutls.org/pub/gnutls/gnutls-2.2.3.tar.bz2]
+md5=71d9b7ec32a2a67854940a8848c2b229
+sha256=cc78e52e9afc3006e4d97bf1c4e232fa6253f8be15ee6ebb7272ce885213f34b
+
+[ftp://ftp.gnutls.org/pub/gnutls/gnutls-2.2.5.tar.bz2]
+md5=ebd3dc3ed4dffde781a2dc4eb4e39f3b
+sha256=cf2689bd5b5f095e27f7a1aa2246212ef9322c0707aeb104238e9eb0f925ae57
+
 [http://ftp.5z.com/pub/gob/gob2-2.0.14.tar.gz]
 md5=f8721af6f4e90ff48bd7cb4c96a5a94c
 sha256=c2977b18d1166c62e3f04373feefc0e2af704da3cb98e32612be4a55fd77a3f9
@@ -4978,6 +5026,10 @@ sha256=4871c52b2421b582330a0f9dc6a42da3b706140c346aa0cd690eb40758afe152
 md5=f1016148ecbfba968c0ef1773066988b
 sha256=9c514d4002fb2a2efc5c60e009c330be2ee05c28649d73de3aa45530161c2c62
 
+[http://gstreamer.freedesktop.org/src/gst-plugins-ugly/gst-plugins-ugly-0.10.8.tar.bz2]
+md5=090d87a1716eee45a9804ca8558668da
+sha256=643a9414e3c883f4a87d0d4f1bc88a43045667fa0afc995cdbedecc90c8da4de
+
 [http://0pointer.de/lennart/projects/gst-pulse/gst-pulse-0.9.4.tar.gz]
 md5=7c60018e8b9ce7f62c7078bee5851f07
 sha256=3cbce4b90328530980c6af3b4ec0c818b98df9e63a6bb4b2b350d806f0fd8d98
@@ -5486,6 +5538,10 @@ sha256=c231f87d4103293b119c3231574f67dcda29d383e0c0cbb420b4d10d7add4189
 md5=e9ef4b8b78ab64cd7dbd0d41b05e932c
 sha256=ed4f25e0da55714c618c2721209a2d22a7296b5dc85af028d20aff6062a4a13b
 
+[http://www.rpsys.net/openzaurus/patches/archive/hx2750_base-r34.patch]
+md5=38e1ea5768cba4be72088a8a12d4b1af
+sha256=837b95b128815f3d6689d2ecfbdc9a28023bae5f45879513f3b4c2ad12f459ee
+
 [http://www.rpsys.net/openzaurus/patches/archive/hx2750_bl-r7.patch]
 md5=059e56be476891e84715c897b5935431
 sha256=e01b7efcfafa5c00cd1786d71b526f963dcd5129b518cab2b597d21c5d68eaa8
@@ -6862,6 +6918,10 @@ sha256=74c81e8c29de3fda2e196ce7082a5ec35aad9399a6c7f67bb906b3c9d91dc6f3
 md5=493de1bfc84c1e0f82fd865795e48ffb
 sha256=039861766d330b8ff2309334feb97d384e16d927dd859fdc0fad4c4a13d66b7c
 
+[http://downloads.sourceforge.net/libetpan/libetpan-0.54.tar.gz]
+md5=0214de45b1b92277fbfc6c9a00af5316
+sha256=f4547fae43a30265dd1d1e7f88c556d067a3ba67ca7ec0d46e540e6dc561a010
+
 [http://monkey.org/~provos/libevent-1.1a.tar.gz]
 md5=6cc776458ecaf9247550863702a44d7c
 sha256=1725cd3dd9ec87a68316c36a50ab653c7e9581c91f9b1b7e9af42a9c7c499d8e
@@ -7514,10 +7574,30 @@ sha256=f9c803ba28d5deb18d9feb5c7818ce99325b09204b7dc0447798f2f47a657a46
 md5=c685e69929333a763c51987b4a19d50d
 sha256=5da9e72de291e7654fb59bf40b647633f3afb3cde924bd11b80d6ed26c911feb
 
+[http://www.opensync.org/attachment/wiki/download/libopensync-0.22.tar.bz2?format=raw]
+md5=f563ce2543312937a9afb4f8445ef932
+sha256=3394bae1e3bcfe463d139a367ba5ebe73d968df128c871842dcb4965a725d0dc
+
+[http://opensync.org/download/releases/0.36/libopensync-0.36.tar.bz2]
+md5=d8cc7835663566e3626e959d8fb531bf
+sha256=c686d27f0818e2d8cc6277ba123c74d7210e70fa2b320c5a828eaaedd598e908
+
+[http://opensync.org/download/releases/0.36/libopensync-plugin-evolution2-0.36.tar.bz2]
+md5=ed3aca114a81ad8cc543b3dd68af657a
+sha256=19f1a24d54daec7b6e1321548799e500893b8aebe6dda995dc8eb162f77932c2
+
 [http://ewi546.ewi.utwente.nl/OE/source/libopensync-plugin-file-0.18.tar.gz]
 md5=a9ffd002169406fb31eee885c9742c26
 sha256=c03ad432d46e8f562ad4eaa08972c5bd229fdc45e5c01ac9af094cbfc38cdf59
 
+[http://opensync.org/download/releases/0.36/libopensync-plugin-file-0.36.tar.bz2]
+md5=785a79d70e3d6e0637c7f21b2a09987c
+sha256=932726d69b398686b9d6a1e2afd53c537c03ae8a476df1b8b00ba1f8b4abbf44
+
+[http://opensync.org/download/releases/0.36/libopensync-plugin-google-calendar-0.36.tar.bz2]
+md5=69b382845fb62a58e1976bc74a82dd86
+sha256=df3b64322b5f7e0e67317e58b46e9884837a771c69d9513dfb16dafeaeaaa2bb
+
 [http://ewi546.ewi.utwente.nl/OE/source/libopensync-plugin-gpe-0.18.tar.gz]
 md5=6b35732f34aad4becfc24ee500d32c9b
 sha256=218e8d5194d866109db3419c66d071cdbd319446288e7012ed135d4a6b8a3762
@@ -7526,6 +7606,30 @@ sha256=218e8d5194d866109db3419c66d071cdbd319446288e7012ed135d4a6b8a3762
 md5=52f86db50d653f5af0adefeb76cf9a31
 sha256=db7250647b86dc8d0bd45c73d454d73ca182c88f6ffe2ccf1760f40be81080f2
 
+[http://opensync.org/download/releases/0.36/libopensync-plugin-irmc-0.36.tar.bz2]
+md5=21f9789fa41c2f06c547a17bc13c6081
+sha256=f7ccff0bc136d3aa21ab961f31414f4856a94e9f1a1b17c44c8ec33b67ace4ac
+
+[http://opensync.org/download/releases/0.36/libopensync-plugin-moto-0.36.tar.bz2]
+md5=8dcecd4afb87e4645a152194fd3b5e55
+sha256=341c05e78a3254a979c073881cc1b2d3be3eb505a925dc99adc8124a4dd31bc7
+
+[http://opensync.org/download/releases/0.36/libopensync-plugin-palm-0.36.tar.bz2]
+md5=ee05ffadee75094d78a15e2704f5e64f
+sha256=e05b862d11af137e31f28279f7a6356d583cc4adb1293ffedfdcf86728882e52
+
+[http://opensync.org/download/releases/0.36/libopensync-plugin-python-0.36.tar.bz2]
+md5=6247a7e96de3fa55c1fb58b2f364fb5e
+sha256=9ecfa677d155a8e9e2674fabfa76adbeb45b887a321368cdab082618d27603a3
+
+[http://opensync.org/download/releases/0.36/libopensync-plugin-syncml-0.36.tar.bz2]
+md5=3c83493143fbfabf6600aea8d310167c
+sha256=d0db5ccdbf98012a9b70671c7b90cf8eed1f5133ac61563e97d7abf1533dc6e9
+
+[http://opensync.org/download/releases/0.36/libopensync-plugin-vformat-0.36.tar.bz2]
+md5=f3d1efdc1e7142fc74364e92f2066ee0
+sha256=926e6125b4be2d206c6618f8e9445a465df44fe013f23ec339679af307b342c9
+
 [http://handhelds.org/packages/libosip/libosip-0.9.7-hh2.tar.gz]
 md5=ffc20af80f77653ab534d2a103a2276d
 sha256=b67c0218b7cd2d521783bf055b13c598bd04b623cbf4adbb3cc76bd3ac57dc5d
@@ -7762,6 +7866,10 @@ sha256=a380be6a78ec2938100ce904363815a94068fca372c666b8cc82aa8711a0215c
 md5=a6b5becd4b61e246ed2ee95db9f6e746
 sha256=2be78a947bdbfd24aa4f35ae97d2b7bafa60162c5e824cf3dd085b40eddee8ff
 
+[http://libsyncml.opensync.org/download/releases/0.4.6/libsyncml-0.4.6.tar.bz2]
+md5=d524b18c1eafe5805f83e29c01a91b66
+sha256=818740eb5df3cf7913ab7e7979874ccf403831744c89efa4ebaf74c7e2c090bc
+
 [http://telepathy.freedesktop.org/releases/libtelepathy/libtelepathy-0.0.55.tar.gz]
 md5=2cbbbeaf97c154a7fb9b088b95deb70e
 sha256=53e8740a3a36ece8078b371b95c79646dc69f0ad3ee2665e5fb659412c0baf35
@@ -8122,6 +8230,10 @@ sha256=ab0f647d52f124958439517df9e1ae0efda90cdb851f59f522fa1749f1d87d58
 md5=296a6d150d260144639c3664d127d174
 sha256=c95280ff6c5d2a17788f7cc582d23ae8a9a7ba3f202ec6e4238eaadfce7c163d
 
+[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.19.2.tar.bz2]
+md5=ca0ce8f288e8ae93ac243b568f906bf8
+sha256=c55c52caa613d1f25718b35811e4614d9712b9e1de56a91aa73c867f351a540b
+
 [http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.19.tar.bz2]
 md5=443c265b57e87eadc0c677c3acc37e20
 sha256=c2fd6bcd2b7c1b3d37d64e4d1825703792a75474830a3db7d2dc603a8d392d58
@@ -8134,10 +8246,18 @@ sha256=2c14ada1ac7d272e03b430d3a530d60fc9ec69cc8252382aa049afba7d2b8558
 md5=1b515f588078dfa7f4bab2634bd17e80
 sha256=f187b12d70e0a48ce81f0472dfe9504fb5f0f966be339ac9d57dd2b991a74942
 
+[http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.22.19.tar.bz2]
+md5=4db27facb78aeb79d06e6ae6bf0ac0b6
+sha256=9879bb214a12b15a6a589fe15c2acad3177b3a49fd03a26e79ae558755e98a4b
+
 [http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.22.5.tar.bz2]
 md5=f36616d74f2fde72040bccf50db03522
 sha256=7904cd53bf681611dff65d04afcdab6205f6e06cb0c40a568174d83a3a5d8a01
 
+[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.22.6.tar.bz2]
+md5=20af4d1e05bd725e89b691da483276e9
+sha256=914424a9ae14cf6fa2debbfed327e071b43b06daf5085282cdb133a02fab1ca3
+
 [http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.22.tar.bz2]
 md5=2e230d005c002fb3d38a3ca07c0200d0
 sha256=73c10604c53f1a6ee65ef805293d23903696f8cef864f42d7de9506f0d2ba4c7
@@ -8170,6 +8290,10 @@ sha256=413c64fbbcf81244cb5571be4963644a1e81166a2b0f008a016528363b65c5d3
 md5=3f23ad4b69d0a552042d1ed0f4399857
 sha256=413c64fbbcf81244cb5571be4963644a1e81166a2b0f008a016528363b65c5d3
 
+[http://kernel.org/pub/linux/kernel/v2.6/linux-2.6.25.tar.bz2]
+md5=db95a49a656a3247d4995a797d333153
+sha256=108b2a3f2b05c0e57d1d0977619525e46f8d4b425aef4b38b47dcf94292f2dd2
+
 [http://kernel.org//pub/linux/kernel/v2.6/linux-2.6.9.tar.bz2]
 md5=e921200f074ca97184e150ef5a4af825
 sha256=f5dba6366e87e91234d1b0069cfea655b0a4cb37ea97f899226f16998e6ab9f1
@@ -8182,6 +8306,10 @@ sha256=a812816ee1742bf3bf8977a391b369a7351f54a1917dc90b27e666679dd1742a
 md5=f1fc22939d71224923f168ba179b3e51
 sha256=35b9045edc5992c2d168fc72ca04a57f4e1c81a0ea987fa88342e54f7c79fbd4
 
+[http://www.omapzoom.org/pub/kernel/linux-ldp-v1.2.tar.gz]
+md5=8f22aa4396711f7a7791886bcd623749
+sha256=01f083599014e22ee2ca4894dbe96dd103b7be9d3796b7e075b040a5c324704d
+
 [http://ep09.pld-linux.org/~mmazur/linux-libc-headers/linux-libc-headers-2.6.11.1.tar.bz2]
 md5=1df3e4fbf2670712cecb4953e2d24834
 sha256=8dffedf772a9f75a8cee2a603e1b14e4b7848010dcfa0e6b087afcf4f66da6de
@@ -8274,6 +8402,10 @@ sha256=2f6d619ebbab25f5b5091555f96dc29159fa3c214d1c5fdc5673af97515d18e6
 md5=6c0d60bcc357365af056baa812c45960
 sha256=830ef8c4b65ed34954afc2581447fd0a9afcf5f9de354772352c8da54dceb676
 
+[http://www.rpsys.net/openzaurus/patches/archive/locomo_kbd_tweak-r2.patch]
+md5=c51ae4d5fa800ec81660fdf5b776fae6
+sha256=af92b078cb52f9c58964d49b074a5d09de601435c8e84cec817b636fc53c8eeb
+
 [http://www.rpsys.net/openzaurus/patches/archive/locomo_led_default_trigger-r0.patch]
 md5=38ac643c7e12b808a7f4463ef862aee1
 sha256=0c629eac7ba7fcfc86228d3070579eff774bf0d61ea9b1c4ed93d5c13af97b53
@@ -9102,6 +9234,10 @@ sha256=30261e2f1ab064e089784578e0c63f31d5696a198db5f6ec793776ce70ccddb3
 md5=900be0beea498b18f03e2d67656d9d32
 sha256=f03c69e064f1269dfd5adbc668204d0a7e0eafb86317e293e9d6c1ce0a4f5761
 
+[http://www.opensync.org/download/releases/0.36/msynctool-0.36.tar.bz2]
+md5=9ef1c03d1e087493dbca67dabb612e6b
+sha256=de08e22708348216e0e1ea3c32b4cf0c04d5acae5057b5995fc087790f0ae1a5
+
 [http://downloads.sourceforge.net/mt-daapd/mt-daapd-0.2.1.1.tar.gz]
 md5=87356d2750ad82388a58d901aa566465
 sha256=92d9abd2d0cabaea198b9434100ebf1d5524283de8df02b0f04d907b2274959b
@@ -9514,6 +9650,10 @@ sha256=d35213dc854f1e1a08512154c7a92fb94d9f0506cc5107f8b2f248412679fb53
 md5=f5f83204652627cf51d2567c53df5520
 sha256=62d36b998b9ec21864263d17e83aeb30a300a8f0d336a057ca9610b447b9ce7a
 
+[http://www.openswan.org/download/old/openswan-2.4.7.tar.gz]
+md5=70f22e8adc39e07a165f75eccb7cd079
+sha256=b839b024fd717a404711f5ec14ee9b9e412a080f23e90841cde14f20970dc5dd
+
 [http://www.openswan.org/download/openswan-2.4.7.tar.gz]
 md5=70f22e8adc39e07a165f75eccb7cd079
 sha256=b839b024fd717a404711f5ec14ee9b9e412a080f23e90841cde14f20970dc5dd
@@ -9870,6 +10010,10 @@ sha256=95880162dd0839d9b509152e34cf9356b051dff7daf2216ff50474efbe68f6c3
 md5=527687c63f4252989dba6fb92baf9707
 sha256=1daafd156f00c2b3b7981f197465d78e689fda506054d011ba0da6513319fe2c
 
+[http://kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.26-rc4.bz2]
+md5=b5f96d823b1183ba0c4e61516e1a23c0
+sha256=45994ebcdd4ed30b37c6fc0569ee69aee4f2ef9ed75857d0a3784ce3bfe92ffc
+
 [http://www.muru.com/linux/omap/patches/patch-2.6.9-omap1.bz2]
 md5=d6249654087f0bcafaa860ac573316a4
 sha256=91806347cb386002a8bfd20ee66e536e4a7dfb01f207dd751341f2971090d9ac
@@ -10122,6 +10266,10 @@ sha256=a5781c8a4c0c71224b23f1c4155609baeee0eca8ce7cd34c1c969a65d6c6bab2
 md5=3ed63ce3884d6cdd71b6d471e3c49407
 sha256=e87d44d5a77c591db83598295109c033708a458797247a31cfa20d54c52d7b41
 
+[http://www.rpsys.net/openzaurus/patches/archive/poodle_pm-r6.patch]
+md5=e897eb0dc64c2862091f97e20f580de6
+sha256=66283a36122d77a4118a1b2e48af92c03ae09b3e53fe7875e7fe3db1486a522c
+
 [http://www.rpsys.net/openzaurus/patches/archive/poodle_ssp-r1.patch]
 md5=8efe67bc46564512bd1de09fce5971ab
 sha256=3238cc3553f721c110822bdc7fbfe7c57f33f59a05e406a19e956e71a1712aa8
@@ -10330,6 +10478,10 @@ sha256=2f18dc8e553b2eb9e40e429ccc829e2b8e25d2f82929cfbc4149b1147d00eee1
 md5=9cb4a25331a4c4db866a31cbe507c793
 sha256=72353660c5a2caafd601b20e12e75d865fd88f6cf1a088b306a3963f0bc77232
 
+[http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-0.9.10.tar.gz]
+md5=9187ac1b302b9ab45f355242f453882e
+sha256=1ae8b587759b33ad954e717728fab6df58bd28088d0ac8faf22e90253b774975
+
 [http://0pointer.de/lennart/projects/pulseaudio/pulseaudio-0.9.5.tar.gz]
 md5=99b5d9efd4fce35cabb4ae5d0ebb230d
 sha256=cd82eabcf9fa310a64b58b621730cebe5d3edae7596a9c121155db455b1e58f6
@@ -10474,6 +10626,10 @@ sha256=f6dc5a05456a6d4abb9e8b80df70aefac6f8764d04e079aa4c4c5b45cd0ff9bc
 md5=4f41fd3a0e031a26d3a2d354f5995ffd
 sha256=3959a45bb65f66a622d7752e41808604032f4ab66f736f96fee83e252d85df5a
 
+[http://www.rpsys.net/openzaurus/patches/archive/pxa_keys-r9.patch]
+md5=c1358d4c210d1d701b5b0d96d8e73c12
+sha256=8697e76beb6ea44ce450e8cb9bed764803fe189eaea89e0aa72ebd1974bc52e4
+
 [http://www.rpsys.net/openzaurus/patches/archive/pxa_timerfix-r0.patch]
 md5=69e6907a10d88362d6cf4fd2e806ab42
 sha256=c7d82fbe1d008edfb5ae53879de24bb882b2cdbd9ee9aab67389910da499210e
@@ -12178,6 +12334,10 @@ sha256=c2bed5d4ec064e0ac9c73c046e545dfad5ebfce3c84bdade1323a9f7a5265056
 md5=95e9a5dfc1852e2db3d1d9da6df439df
 sha256=83097559d413b57aa67da1de975e8fbb99d02a2b2166aad57d7b30881208ff1e
 
+[http://www.rpsys.net/openzaurus/patches/archive/tsc2101-r19.patch]
+md5=c70fa3e0184842e4f6822b7002eac33e
+sha256=7ca39d0df0a102114eabcd39df94ff271d81a71d9ef9f61915ac0a04031b68d1
+
 [http://repository.maemo.org/pool/maemo/ossw/source/t/tscalib/tscalib_0.0.1-3.tar.gz]
 md5=a06f80dfda9688e033561f959aae2d5e
 sha256=b27add2e28f38feea0c554633f220cd7542a8bb768ba290636a317852774ecbb
@@ -12538,6 +12698,10 @@ sha256=e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
 md5=1c26f40af343bcc465f5832e2c9548d6
 sha256=bf0ca221bc5e8a6b06f73a1eb6ae1470ec5b34b987669f7abeb499e6402af3b0
 
+[http://dev.gentoo.org/~spock/projects/uvesafb/archive/v86d-0.1.5.tar.bz2]
+md5=81ae073aa38317acdd4c5ecdc15da386
+sha256=8c8db0b6de0bae2c065a68d31369e750dc03bd875bac78e87763e263f3bc2588
+
 [http://people.igalia.com/berto/files/vagalume/source/vagalume_0.5.1-1.tar.gz]
 md5=5ec548c343de435b94a7b39f5c853292
 sha256=10263676cb872ca48d8d605be44eb1e6260419675409732e7e5a76eb41843cee
@@ -14698,7 +14862,3 @@ sha256=12f5b654f6b91953391d2492a09d2c9586d5b7af419f0eeb306e1d30245659d3
 md5=a6538f6c44ceeed0ed7e8e356f444168
 sha256=f684397ce39ec400ba3369521892b7c3a8711d3ef1be59115db9f8d57707bbb8
 
-[http://www.call-with-current-continuation.org/chicken-2.6.tar.gz]
-md5=332edae079bb34d815369f4ba5181983
-sha256=32385c5393c7376035f911f3e887351b1ce8fb6e56498cc4258815bc6db06326
-
diff --git a/conf/distro/chinook-compat.conf b/conf/distro/chinook-compat.conf
index 007b33e49d..f6029eed1b 100644
--- a/conf/distro/chinook-compat.conf
+++ b/conf/distro/chinook-compat.conf
@@ -52,7 +52,9 @@ PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "glibc-intermediate"
 PREFERRED_PROVIDER_virtual/arm-linux-gnueabi-libc-for-gcc = "glibc-intermediate"
 
 PREFERRED_PROVIDER_virtual/arm-linux-gnueabi-binutils = "binutils-cross"
-PREFERRED_PROVIDER_linux-libc-headers = "linux-libc-header"
+PREFERRED_PROVIDER_linux-libc-header = "linux-libc-headers"
+PREFERRED_PROVIDER_virtual/libx11 = "libx11"
+PREFERRED_PROVIDER_gconf ?= "gconf-dbus"
 
 PREFERRED_VERSION_automake-native = "1.9.6"
 
@@ -84,6 +86,9 @@ PREFERRED_VERSION_glib-2.0         = "2.12.12"
 PREFERRED_VERSION_pango            = "1.16.4"
 PREFERRED_VERSION_atk              = "1.18.0"
 PREFERRED_VERSION_gtk+             = "2.10.14"
+PREFERRED_VERSION_libpng           = "1.2.8"
+PREFERRED_VERSION_dbus             = "1.0.3"
+PREFERRED_VERSION_expat            = "1.95.7"
 
 PREFERRED_VERSION_gnome-vfs        = "2.16.3"
 
@@ -138,7 +143,7 @@ PREFERRED_PROVIDER_gdk-pixbuf-loader-wbmp = "gtk+"
 PREFERRED_PROVIDER_gdk-pixbuf-loader-xbm  = "gtk+"
 PREFERRED_PROVIDER_gdk-pixbuf-loader-xpm  = "gtk+"
 
-PREFERRED_PROVIDER_gconf                  = "gconf"
+PREFERRED_PROVIDER_gconf                  = "gconf-dbus"
 
 PREFERRED_VERSION_pixman                  = "0.9.6"
 
@@ -193,6 +198,7 @@ PKG_glib-2.0 = "libglib2.0-0"
 PKG_gconf = "libgconf2-6"
 DEBIANNAME_dbus_pn-dbus = "dbus"
 PKG_libhildon = "libhildon1"
+DEBIANNAME_eds-dbus_pn-libedataserver-1.2 = "libedataserver"
 
 PKG_zlib = "zlib1g"
 PKG_libglade = "libglade2-0"