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

4 files changed, 236 insertions, 2 deletions

diff --git a/conf/checksums.ini b/conf/checksums.ini
index 7ce7a86342..8f9d839afb 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -82,6 +82,10 @@ sha256=02f10b35508cb11908bb908156daad1ea5e653840440d62482231efeb4cbe178
 md5=24b0e5bbfe21ea9c5a5c589bcc79c0f2
 sha256=ab877846c6caaff32efbf5be6fc5c63b7dec97a2e78c57c525da7705d2052bfc
 
+[http://monto.homelinux.org/89notifier]
+md5=6a197a3216abfd21ce2ae37b2be8da38
+sha256=7795a3c6339c35d172ced0e43785ff657c1430f9fab7e2e553411529e177e501
+
 [ftp://download.dre.vanderbilt.edu/previous_versions/ACE-5.6.8.tar.bz2]
 md5=81c1ff761c3431cd12c81337aa80d558
 sha256=96b70582d931a7e83c3ca31b3bc7e23957391e16dee4ae6ddf938c9574d50b27
@@ -294,6 +298,10 @@ sha256=c54e779a720841126e23d692de85243e23b0d94fb7792a958b96b5bd097a8b85
 md5=ce018f681b469a1d72ffc32650304b98
 sha256=830a1bd6775d8680523596a88a72fd8e4c6a74bf886d3e169b06d234a5cf7e3e
 
+[http://www.diskohq.org/downloads/disko-1.6.0.tar.gz]
+md5=c63bad58524501e367af9842f510b458
+sha256=fe578299be4031d0c2454ff4fd3b3034e332260b9695687adf27a776a61eb2e4
+
 [http://media.djangoproject.com/releases/1.0.2/Django-1.0.2-final.tar.gz]
 md5=89353e3749668778f1370d2e444f3adc
 sha256=50a5d228743a69a682899b20141194bf8fd3fd75eaf33ba5f2932f43ea93ea0d
@@ -614,6 +622,10 @@ sha256=3d73988ad3e87f6084a4593cc6b3aac63aca3e893d3e9409d892a6f51558e4c4
 md5=02816f10f30b1dc5e069e0f68c177c98
 sha256=c3de74d62f925e32030adb3d0edcfb3c7a4129fc92c48181a389eeed8f14b897
 
+[ftp://ftp.freedesktop.org/pub/mesa/7.6/MesaDemos-7.6.tar.bz2]
+md5=0ede7adf217951acd90dbe4551210c07
+sha256=2fdf09fd7967fb1946e7f6af07d39c9fb695c373e1bad3855d3c3fbece5badd0
+
 [http://downloads.sourceforge.net/mesa3d/MesaGLUT-7.0.2.tar.bz2]
 md5=3a33f8efc8c58a592a854cfc7a643286
 sha256=fa31ca39f00ff92c7da59d9993d0eefb8d901eb8a519743942e523fde120eb6c
@@ -678,6 +690,10 @@ sha256=a9cc62ab760afeebcb1319a193508734a2d470cab8effab2776a2d3c65bd9cd2
 md5=7ecddb341a2691e0dfdb02f697109834
 sha256=6e945389add4e5b41f2c403ced13c343767565f2eacde4b16de2d0f9f8a6aac4
 
+[ftp://ftp.freedesktop.org/pub/mesa/7.6/MesaLib-7.6.tar.bz2]
+md5=8c75f90cd0303cfac9e4b6d54f6759ca
+sha256=782a7b2810b1c466b3a994eba96485b59b47cc1120c0caa24de1aecf1e013830
+
 [http://search.cpan.org/CPAN/authors/id/K/KW/KWILLIAMS/Module-Build-0.2805.tar.gz]
 md5=598bb59b86c2c4842eeffb03392fab5b
 sha256=8fd609d1e6b460b5c95ad5612cb823aa863d51360ed55caea987909a9bab50f5
@@ -818,6 +834,18 @@ sha256=4e44eb7be990cb62e57840f4b01b6c9af06c4655869d0cb565fc45749c20b82e
 md5=955082ee50358b1cc3eddcb438b7fae4
 sha256=70e7fb5e8cc3a35a04213230e1e4340ddc8766a2615318086da7d51ec930f6f2
 
+[http://www.packagekit.org/releases/PackageKit-0.5.1.tar.gz]
+md5=8575a23e406fffa8d11ba2ad4b5d99f3
+sha256=d6ccb149de52c76993f0ed9a31f44690fa27254f91fe8b69bbd2f99b714aee29
+
+[http://www.packagekit.org/releases/PackageKit-0.5.2.tar.gz]
+md5=e406ad5e776e31c99e70c7cf6e7bcdc4
+sha256=8defbfdfe6937fd1d4320f2c2e599b5579fec14404a4e920ff2e5ac68516744b
+
+[http://www.packagekit.org/releases/PackageKit-0.5.4.tar.gz]
+md5=330f52c7576e78b270cd78016bb32dc3
+sha256=9d13f59594f00a1f1d67ab1b34208daadac67f7eba59a2bede35eecc287f7542
+
 [http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Params-Util-0.20.tar.gz]
 md5=33c4466239c97cc3e1063eff0577206c
 sha256=29f7e05045a5699b211d2a8332d36113c22f9c2e96174f40939e79dbc356905d
@@ -874,6 +902,10 @@ sha256=ad82569b809e29c19b8223feaa12923f97bb4bbc942ff985857f9d853db489cf
 md5=104ad743d4bc999796ceff4f39d1003a
 sha256=593912fdf122d9a1499767bc305ca7b3b688ace7edcb93f53e07202aa1242c58
 
+[http://pybluez.googlecode.com/files/PyBluez-0.16.tar.gz]
+md5=2ce8ff0dbb94c6be14e92e9968f4c914
+sha256=cbe1f076a4947e29ded08ba9dd6dbbb86b25939fb4e50f508dd02f41681554e2
+
 [http://www.vanille.de/mirror/PyMP3-0.3.4.tar.gz]
 md5=28e884057750aa4f0da368678e5b20bd
 sha256=e534ea5505e2d0a571ca8baa4b34260953e796f6c762013756373f13411ebd6e
@@ -982,6 +1014,14 @@ sha256=5318946df77937e0b601c95a198790f9ba52d4afb4eb153480289350182bb739
 md5=b3db3d60b0ee83f5f23101d2c3bb99e0
 sha256=ea1d3a8141654781a0df31e6607c4722436fa33eb2e9934492770b3b61be8122
 
+[http://downloads.sourceforge.net/project/pythonwebdavlib/pythonwebdavlib/Python%20WebDAV%20Library%20-%200.1.2/Python_WebDAV_Library-0.1.2.zip]
+md5=8e49e0ecc5b4327c4f752a544ee10e1a
+sha256=72c029ad1e25de950f59c2f1812d009d2c1691b70e4b5b09f1af9006e8fd5f23
+
+[http://downloads.sourceforge.net/pythonwebdavlib/Python%20WebDAV%20Library%20-%200.1.2/Python_WebDAV_Library-0.1.2.zip]
+md5=8e49e0ecc5b4327c4f752a544ee10e1a
+sha256=72c029ad1e25de950f59c2f1812d009d2c1691b70e4b5b09f1af9006e8fd5f23
+
 [http://www.stats.bris.ac.uk/R/src/base/R-2/R-2.0.0.tar.gz]
 md5=3900bca37cabb4b76b8d736d51cc9251
 sha256=a06c3546400503e6d4ca4505c3f838b9bbd03fab6a3cbab7993f6d9115b68b64
@@ -1494,6 +1534,14 @@ sha256=bda8a3c42733853444e1d4bee16e85990b78c2eaafc4b26e0769be2e14dab931
 md5=9703f591801c5bbded35c9739d04f81c
 sha256=68b1d0acd1a6e17d91412635cd4f65ba58d293e62a01475a43f3712c49a46e7d
 
+[http://www.delorie.com/store/ace/ace-1.2.tar.gz]
+md5=03e5e7ab8ac3acc59661c6e9c09089b7
+sha256=fcda8bca508490bea642c83fcf718565bf4ed4c50f2d7b34761da61fe2e6bc9d
+
+[http://downloads.vdm-design.de/aceofpenguins-launcher-0.3.tar.gz]
+md5=2fe7dcdbbdbf3b2821f627e02c406caa
+sha256=13013cd19cb165825f4ef5cc790b0e103705f68ece470fd12012db97e3e60839
+
 [http://downloads.sourceforge.net/acpid/acpid-1.0.10.tar.gz]
 md5=61156ef32015c56dc0f2e3317f4ae09e
 sha256=22703ce0dd7305aca01bc9ac741659c32b1593f1d6fde492df7f01067a534760
@@ -3038,6 +3086,10 @@ sha256=b1e6d5912546d2a4b704ec65c2b9664aa3b4663e7d800e06803330335a2cb764
 md5=62edc09c9908107e69391c87f4f3fd40
 sha256=b1e6d5912546d2a4b704ec65c2b9664aa3b4663e7d800e06803330335a2cb764
 
+[http://download.tuxfamily.org/blueman/blueman-1.10.tar.gz]
+md5=f9058305c42038678d5023fcabba22a4
+sha256=f4a92834a538dc9dbb93fde76933e849b24639faa1721b24549f209b8b590f71
+
 [http://gpe.linuxtogo.org/download/source/blueprobe-0.13.tar.gz]
 md5=33745b0e86603124654773c1361df33e
 sha256=b4318d0e1ba7422ba4415838448718e037efe4d8236cf12132075ccf36d1803d
@@ -3454,6 +3506,10 @@ sha256=5ab58cf5738c144f4d85a4a442c2f33be2c4c502dca6e29e0c570c2a51ae6ae9
 md5=41d6a2dfe88693b5ec999d9ae4e97aac
 sha256=e3ff9a7f6dead90d55f1a4a2b1277e3bf5f0ec44ccb6ba8f375acbbedb1263c1
 
+[http://handheldshell.com/software/fso/btgps.tgz]
+md5=6e0443d09448a5cfdb1d560cfd699a6b
+sha256=ca567348c1f8d904f50fe06de83959dcc5b840e12e336251ab216ca5304e3bf0
+
 [http://www.pentest.co.uk/src/btscanner-1.0.tar.gz]
 md5=6bfaaad5a3730f10d07500fb3ec8c797
 sha256=ca7349c3621c929f9fda0345991b35f8a0d38d4a88b6c89b7ca50a7dbcc08832
@@ -3654,6 +3710,10 @@ sha256=1ea5bd257f755ffcae2c7a1935c37147c7392478922410e0870361eea08b6c27
 md5=63220327925ace13756ae334c55a3baa
 sha256=1dfc4903dc0172286df4f1740fd0f12749ac81d51c602290b47cbe83d51e1d56
 
+[http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-0.99.4/cacao-0.99.4.tar.gz]
+md5=c5e6525c5212ddbb6026e4a7cde37ca6
+sha256=c6090c1d2ed3c60acda0076b62563598267be8dab270ce49ee1035002a2510cf
+
 [http://cairographics.org/releases/cairo-1.2.2.tar.gz]
 md5=2460487b1257a5583c889b1b9d2033ec
 sha256=9d53b8dd0bf76dd0da7cdbe65a6c6934be49bd3942dc5f7ef7bbcc7529d9ee02
@@ -3798,6 +3858,10 @@ sha256=015c4237a532b873990aeeecdf351138ce5a811d062d6db73c611a4985de5435
 md5=b8c51a2e3cccb381428426c0fc543244
 sha256=f1e44d628cc4cbac192bf33f492ad8d1e1988cae576924128df36f3638e9a485
 
+[http://alioth.debian.org/download.php/2924/ccid-1.3.10.tar.bz2]
+md5=92220d7b7b0aae7bc141b09ba529458c
+sha256=54610f1a6cd65e8d2b5cb9f7917e509ebcdf130a565e71e06ad4e65ed0dad5ec
+
 [http://alioth.debian.org/download.php/2482/ccid-1.3.8.tar.bz2]
 md5=ebb5fc927d73cd63737a9114481e8957
 sha256=8cb892ef36321069eff7826aa732f1481715fe54bf96346fae1d25565b44c536
@@ -3850,6 +3914,10 @@ sha256=548b5b402ee5fff34fe428eb69de560b56709337cd70c600ad21686c1321dd66
 md5=7b19b6f68d2c648296378b784d5f7681
 sha256=73de81ea2de2eae64b888e1b2739ef643ccea13c79790569f8e6278369976a21
 
+[http://ch.omoco.de/cellhunter/files/cellhunter-0.5.0.tar.gz]
+md5=1ac5c56a85fb12bea0bf0a4a2ea664de
+sha256=1210dab4e3b23c2a5083d12e9c1527bf099a89f06867e1210b7d9992204c24f8
+
 [http://pub.risujin.org/cellwriter/cellwriter-1.3.3.tar.gz]
 md5=09b2019e926d5ef42d52edb2dd33ceae
 sha256=3fb7c11ec5d802338a0bf522b11702c37820597c9a2c36f89b52872c6571e602
@@ -5234,6 +5302,10 @@ sha256=c5d49b39c5998bcecd124c05cc6f096d22ccdc378ad455214611ae41a2f4b7d9
 md5=8ce5945be0660bd3152bd9eb0827f945
 sha256=e3968765ed916b348fce5e309029d25d068a61e1d422a69a506d0fc80ee6e976
 
+[http://home.htw-berlin.de/~s0526295/dictator-0.2.tar.gz]
+md5=8f5cb1d0b7c7d5437b260d9ba5362c74
+sha256=e43251af443eb72a803a6aac3e984feb1f5df8124c64b55fceac6140ab76161e
+
 [http://didiwiki.org/sources/didiwiki-0.2.tar.gz]
 md5=a8643526ced64ed066df407e013259e3
 sha256=a87cdc67ad367d6bde595811e7869f5c4715e4baeec7261bcfe45ab42621543a
@@ -5326,6 +5398,10 @@ sha256=bd72287adedccf493f046f0e6ca29ef47f2cd3741c62a98d5eb82a9068846b73
 md5=b65233d368bbd265a55effcf2c17f84b
 sha256=47e695a5d370eb656f5e41eeb917ad6281b1559bf60172c9eca89b5518a9f9b9
 
+[http://www.dillo.org/download/dillo-2.0.tar.bz2]
+md5=bb9999cabeb4db3d915687de465dbeb0
+sha256=847d1db31bd68ab9ab94b642b0cd40ac8d3cf816900f5d5652124986601df1e9
+
 [http://dircproxy.securiweb.net/pub/1.1/dircproxy-1.1.0.tar.gz]
 md5=066bd39d80f286ae5ce69a2adbbd01e4
 sha256=f0be78d2c2f0279cce26b0b2e87077bfe568f1da189eef2daec78b1e12699c4e
@@ -6126,10 +6202,18 @@ sha256=17c450622752cbda0e41fffd496d3022a533659f3db942e14da8015c47623856
 md5=408d3c63f9efa06e93e29a691c28985e
 sha256=6f40962eb8d76e0e9d76ec9f461d62c6af8561028d194358aed001827cc418fc
 
+[http://downloads.sourceforge.net/project/epydoc/epydoc/3.0.1/epydoc-3.0.1.tar.gz]
+md5=cdd6f6c76dd8bab5e653a343a0544294
+sha256=d4e5c8d90937d01b05170f592c1fa9b29e9ed0498dfe7f0eb2a3af61725b6ad1
+
 [http://www.inf.fu-berlin.de/~rschuste/er-refresh-tools-1.3.1.tar.gz]
 md5=f100632e67f94ef4fffa4da32d25427a
 sha256=748359a51e008c179dc5dd5e2974f4b1279c78e09a2613a73d15cd22cb55e8d8
 
+[https://garage.maemo.org/frs/download.php/4737/erminig_3.0.3-3.tar.gz]
+md5=d710853b0559c9919c730e503c0f05e2
+sha256=45490d585d62e2a36d202f7ca9b91883f257c24b51471894bf23b64e76ba89c9
+
 [http://www.burghardt.pl/files/esekeyd-1.2.4.tar.gz]
 md5=5eb8d1b02cdd99d0681e946768e529db
 sha256=7267db1685b04e766b782e4c5aab9729bf3f23b86d568a3a513c77eb91aaed03
@@ -6666,6 +6750,10 @@ sha256=c18e6f23315e0a3526229bd0ba5cf8ce0d747cb5e5ba7cb952ad08c85a1cafac
 md5=1b84621072b4f906b5686a4fbae0b1d7
 sha256=d06e7244dcd2b462c0e7bea0d01edadb54905f4533afc45f971ab9f6ee46497c
 
+[http://projects.openmoko.org/frs/download.php/832/ffalarms-0.2.2.tar.gz]
+md5=6f03b9663245b93e8370e43cc556dba1
+sha256=df0561124faa5c2e64038f5efcf39432c4795829115b86819083ae66b001899a
+
 [http://downloads.sourceforge.net/ffmpeg/ffmpeg-0.4.9-pre1.tar.gz]
 md5=ea5587e3c66d50b1503b82ac4179c303
 sha256=0e9e771114a75c461e813538f129eb05a251b8fc6591a5563420700b8e312da0
@@ -6734,6 +6822,10 @@ sha256=21e68eeb291ab5a9f4d618f2985c16c26cdfeb0f0f37d3b88550446678dab30a
 md5=24e76434ca74ba3c2c6ad621eb64e1ff
 sha256=1a9ed8db0711f8419156e786b6aecd42dd05df29e53e380d8924e696f7071ae0
 
+[ftp://ftp.gnu.org/gnu/findutils/findutils-4.4.2.tar.gz]
+md5=351cc4adb07d54877fa15f75fb77d39f
+sha256=434f32d171cbc0a5e72cfc5372c6fc4cb0e681f8dce566a0de5b6fccd702b62a
+
 [http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/1.0.7/source/firefox-1.0.7-source.tar.bz2]
 md5=5704a8c36de84b408e069afb0c5bc1df
 sha256=10056021004ae378baed886358dc4468af60eafbaa9fcac93401e4db9b9ef7fd
@@ -8146,6 +8238,10 @@ sha256=00f2b73fea5eff79ae26338928187f956427421bc70ddab0ab63fe5a58112b87
 md5=1939de5fe43d12884d85fa5d7797e3c2
 sha256=243dabf3c45530cac8be092f9a1d838a46b46a92d4138870423006ffd6ae4001
 
+[http://gdata-python-client.googlecode.com/files/gdata-2.0.1.tar.gz]
+md5=d646b8f6e32911df61ea0e7379b4bc35
+sha256=a9dba7645ccda502bfeedd3d15f34672b3dec668d8953188b87df36f17c6b849
+
 [http://gdata-python-client.googlecode.com/files/gdata.py-1.2.4.tar.gz]
 md5=521f33a377d64f8a6505ba119415b787
 sha256=fc5ddb8f76b17abd728721a0e0177ea35f55a70106f44dc9010b22eceb06abde
@@ -11850,6 +11946,10 @@ sha256=ca7ef124cde06883fbf28c7e78ce1e4c5526434bbe5672ef0a3e85a61a9d0b5f
 md5=faa08f321fefd2c61ce4c9355a62fe31
 sha256=ca7ef124cde06883fbf28c7e78ce1e4c5526434bbe5672ef0a3e85a61a9d0b5f
 
+[http://isteve.bofh.cz/~isteve/hotplug2/downloads/hotplug2-1.0-beta.tar.gz]
+md5=353656ea499d395260c0de143983da4d
+sha256=54e2fa375506d92a8ac94b5ed332c4c0bf1b69c252692b332c92702670bba583
+
 [http://www.porchdogsoft.com/download/howl-0.9.7.tar.gz]
 md5=85fbe016e2ebad99108b1212ae4b1d6f
 sha256=f8766c44291aac92b2b4abc762e1b11e3504dd9f2a855fdde371b5abd730fe9f
@@ -14230,6 +14330,10 @@ sha256=c3540df46bd9716c6a6f521806c70ae548822a5e62d245900cc28b5fa9fc3eb3
 md5=f02bfa27a21b3040089026975b9dc0b8
 sha256=5677f32eff184883d7ca402234f92142f35bea7d04d503becdd104ae8343cb1c
 
+[http://www.hyperrealm.com/libconfig/libconfig-1.3.2.tar.gz]
+md5=094a82afd382aa2305c6cc3c06025c2d
+sha256=2a680bb33e290c3c799e3a90cf2c0fb9f5482dd930ad93d9f83ce39923258c0a
+
 [http://repository.maemo.org/pool/maemo4.0/free/source/libc/libconic/libconic_0.13-0.8.tar.gz]
 md5=b4078390c459ae4df3acdabca36f53da
 sha256=1ee5bf796367d27987098f73dad866359e188cafe32f1871c12b4469f262c846
@@ -14686,6 +14790,10 @@ sha256=01cb83ef0e765c9856bed79c18a766eed2027f2b2576e8eaa14e02c15c7658fd
 md5=1ac35c278299fcbc69b7dde79a642d89
 sha256=26c7d9c1b7a41f28fea5213484b274be55dcf2bbf5eac723ad795c0c5fb85df6
 
+[ftp://ftp.gnome.org/pub/GNOME/sources/libgee/0.1/libgee-0.1.6.tar.bz2]
+md5=9bf21c1d832fc0313d08829446983fe6
+sha256=d319b87691dfae207d1deeb4ff8bd9e342c1b85d9277be25defb402ae10b496d
+
 [ftp://ftp.gnome.org/pub/GNOME/sources/libgee/0.3/libgee-0.3.0.tar.bz2]
 md5=1ca2b8a87950ef1b14342fb32db3e558
 sha256=fd373e48bbe7a8f4903bd405f6310223321bc1ab22c7c3a7bc6ab0a11256b597
@@ -15190,6 +15298,10 @@ sha256=7f1fa404e5540c880cc747c4a680a89d88b87b10a1c77655f512780fcb0ca5d0
 md5=87d48321bff08de08794132d60b55d94
 sha256=7f1fa404e5540c880cc747c4a680a89d88b87b10a1c77655f512780fcb0ca5d0
 
+[http://downloads.sourceforge.net/freeassociation/libical-0.44.tar.gz]
+md5=e0403c31e1ed82569325685f8c15959c
+sha256=20a4750df8f4dedd718b55117b8351989e0dfa4ad2c966a383550ed43e6a72d8
+
 [ftp://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.11.tar.gz]
 md5=b77a17e4a5a817100ad4b2613935055e
 sha256=fbf5b9a63ea6e3abebfabc04506f0e18a2860071031e34ea4ad4f450b8c43d4b
@@ -15218,6 +15330,10 @@ sha256=63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151
 md5=440835808c577073db7d571357223dce
 sha256=4f707c189259d7b3dda908d78a995366d388fe051aa3554b82cb324426997a23
 
+[http://josefsson.org/libidn/releases/libidn-0.5.19.tar.gz]
+md5=440835808c577073db7d571357223dce
+sha256=4f707c189259d7b3dda908d78a995366d388fe051aa3554b82cb324426997a23
+
 [ftp://ftp.gnu.org/gnu/libidn/libidn-1.15.tar.gz]
 md5=482a25b7b223e52f967fafd284a1a992
 sha256=db75022eff366bd5646ab1e6d7bcd1c2048473a7dbdf0cd0421de92c88bbdc18
@@ -15850,6 +15966,10 @@ sha256=59ded160b3547d29e37cc9d06359f7f37d94112214e4532430cd65e704c1339a
 md5=774eabaf33440d534efe108ef9130a7d
 sha256=004dae11e11598584939d66d26a5ab9b48d08a00ca2d00ae8d38ee3ac7a15d65
 
+[http://xcb.freedesktop.org/dist/libpthread-stubs-0.2.tar.bz2]
+md5=2ba9ce2d46da0a2a1090384ece3387ff
+sha256=d4c47c24e5ec07e974a7ef8f55b2907dd7fa8de82e291a02b15f8c4a7028bf48
+
 [http://gpephone.linuxtogo.org/download/gpephone/librecord-0.1/librecord-0.1.tar.bz2]
 md5=a9e90187c1dc183f497bcae34718e415
 sha256=6fb70d0b8f410f05988e1f3a3e8c86990c3e84c9958041803e6d0658faae91ea
@@ -16210,6 +16330,10 @@ sha256=e234d314f0bdfcc54f52111519624fcd3d1ff37a267c39848b5de7a272367976
 md5=8c8d1f7378734231fd0458569346b9d4
 sha256=9269060f1a8c36c66748520a44d6ffc5059ae736de1e282bb8b6fd65d7890813
 
+[http://tinymail.org/files/releases/pre-releases/v0.0.9/libtinymail-0.0.9.tar.bz2]
+md5=674db3cb4750ba0a3e90aa95ec28bcc7
+sha256=82c4fa4315807af48ed0585b6efd03a42022016364474ead931634e689bce9a5
+
 [http://gpe.linuxtogo.org/download/source/libtododb-0.07.tar.gz]
 md5=5df2e1f7564d066dce6ec24344605528
 sha256=bc3fb1a20ec97149f6e81285a22bdc48fea9c4fbc9abad6919b87ce2f44acbc3
@@ -16778,6 +16902,10 @@ sha256=9f141c606cc93d0550eeb3532626f26ced56687c2bc9f2b8dad387798b929340
 md5=fb345125e23c787df0818ff7caad5515
 sha256=ba1c32207fd62d374c9397a81fb1247da93edb859e30d0d855dc65e5457f690b
 
+[http://download.savannah.nongnu.org/releases/linphone/3.1.x/sources/linphone-3.1.0.tar.gz]
+md5=ed40cf4088c306400b005bbd63ac36be
+sha256=e41e99925e8c81a9e6c7f4cf399da1d9f571927413196898af46ecbebee6a91b
+
 [http://developer.ezaurus.com/sl_j/source/c860/20031107/linux-2.4.18-rmk7-pxa3-embedix-slc860-20031107-rom1_10.bz2]
 md5=d74fc9ea01384bead3925434b932d6b7
 sha256=3dcafe41355fcc688f4a376a5dc71901ea2fbb95698397c87c6a6b12aa058c69
@@ -17154,6 +17282,10 @@ sha256=ee3edf1ea89a90f2b7f82ad09b83c25dc8ea8ca7cf0fce2aa921f897929b2bb9
 md5=6f15406664ef31172c68d46567569bb8
 sha256=9532b981c9b8974ceedd3d25a8f9a0e167a92c9da0dece47f34a4ec34e34b1cf
 
+[http://www.angstrom-distribution.org/unstable/sources/live.2009.06.02.tar.gz]
+md5=088f848b64cef1d54034bc24cfa3c156
+sha256=66c54241bfcc7ea42fe40e1c93739be79a3c065390c4163c0f2647ac45c24758
+
 [http://www.live555.com/liveMedia/public/live.2009.06.02.tar.gz]
 md5=088f848b64cef1d54034bc24cfa3c156
 sha256=66c54241bfcc7ea42fe40e1c93739be79a3c065390c4163c0f2647ac45c24758
@@ -18598,6 +18730,10 @@ sha256=ab4c9191645f9ffb455ae7c014d8c45339c13a1d0f6914817cfbf30a0bc56bf0
 md5=bac989c74ed10f3bf86177fc5b4b89b6
 sha256=ab4c9191645f9ffb455ae7c014d8c45339c13a1d0f6914817cfbf30a0bc56bf0
 
+[http://projects.openmoko.org/frs/download.php/271/mofi.0.02.tar.gz]
+md5=3a2efecc54880a6708d7ddfa88df3df9
+sha256=33a25af95a6aa3a810f5fdf0070ba7744988ad8c60cfc38193ed79b8b4059c9f
+
 [http://downloads.sourceforge.net/moin/moin-1.2.2.tar.gz]
 md5=4032f2305a3393ab18e02efe6550e1aa
 sha256=8447eb112e0e42db59e490fa98b0a1c9ed90ff3660b99734fe5119061eddce8e
@@ -18610,6 +18746,10 @@ sha256=569c9b4f7b2cf411718a3ac5e6427c1babacbaf1b085276f822d8d08040e4a8f
 md5=4a0dbe4e0cfdc15d30958bdc571bbfd7
 sha256=2492f6bd7e2140e62436f11e14b21ec36d17d784fa8271e61f8f06012c83a1d2
 
+[http://mokomaze.projects.openmoko.org/files/mokomaze-0.5.5+git8.tar.gz]
+md5=f4e1dbd444b4049c361f9c1c3d40d32b
+sha256=515d842b79a2c34f5789fa10110bc9d7b15c65a7b1fa623131a1e03599fe7362
+
 [http://www.tildeslash.com/monit/dist/monit-4.10.1.tar.gz]
 md5=d3143b0bbd79b53f1b019d2fc1dae656
 sha256=f6a29300648381538a403f24506e75b94164e26c69c6861ca112d425edc9d193
@@ -19450,6 +19590,14 @@ sha256=a187976c1957a7a0e17014ed97cbb4341f6898d5f60301f1b0c37e52188ebd13
 md5=7fa369bff1031acbe4ca41f03bee7d02
 sha256=53d2f92c3d14423b49c2ff077855cf3987d38def963c82fd26fba5de379ca540
 
+[http://monto.homelinux.org/notifier]
+md5=24d87301da8843e2dbc3330ece57677f
+sha256=896c6942a9a3b0b2d6846eab1de8c471c9fcf860ca182ce18e12f1ce255f42cc
+
+[http://www.galago-project.org/files/releases/source/notify-python/notify-python-0.1.1.tar.gz]
+md5=8f0ef0939cc8edd2efd896ce5ba80cf4
+sha256=8c5ee28017fdc5b110c31cb76503e535e15e0c60b9a1f1e95ff6c018dd806022
+
 [http://hauppauge.lightpath.net/de/nova-pci218c.exe]
 md5=139a1ed50a1a12e47b1f7deedf4f40c3
 sha256=4310a3a526ae5461e17f57353fc29f71d13820a215eaa62c629190cc2a026173
@@ -19678,6 +19826,10 @@ sha256=b99b6e2c1a0977fbe2f0c19210694ed44ff182d17d3920c485fb6ce725b89816
 md5=6b11065c9dbd3c9743d234c2f785fb7b
 sha256=fb093e267e5b9656f767896a33d664e5ee921e28898a481542bdb4db31f7604e
 
+[http://downloads.sourceforge.net/opende/ode-0.11.1.tar.gz]
+md5=5f79628b7b10a7a59092759a5af77775
+sha256=4c225b76d57a5a8094653fba48f3169ac1a99622f3ce98f2be55fbd5a1b76519
+
 [http://downloads.sourceforge.net/opende/ode-0.5.tgz]
 md5=b33b21e04ee9661f27802b6b6c8eefd2
 sha256=5388c4cd4666f270f18216c90ab6526229c53fdc7e82f93ddb0824e69521df1c
@@ -19854,6 +20006,10 @@ sha256=a898b79336c7372c901bcc7e5f83db7b8e79f8e864be6a262f515b3e088bc607
 md5=5c9c1639bdff3bd35c63697d398f1a68
 sha256=3d6c58830e50373d0dc2a72f6fc65afd7ef30aabf2d1078e6878c911270dec16
 
+[http://downloads.sourceforge.net/myposition/openbmap-logger-0.3.2.tar.gz]
+md5=edeea53ea62d241d472912417b5cc248
+sha256=0a6bf110bf108416d85aabd42f01e52860be26a45bd1f0c7fb76252d47f9b19f
+
 [http://downloads.sourceforge.net/myposition/openbmap-logger-0.4.0.tar.gz]
 md5=52b71c33ce0d2da8d5c29db293132630
 sha256=93820366128b394d84b1b37830344b70f349c2896b60b601e884f9d857ff5d84
@@ -20134,6 +20290,10 @@ sha256=2997613ab33ad42dc8269a63b7c40a6938b3552e196780a4a269cc7340dd23bd
 md5=9613e6be14ba7a0ca5d42a88e6ed3516
 sha256=45145ea27333be1552624065297b4d9d76feadf2a4a89fdf0ddafc830ced3a98
 
+[http://projects.openmoko.org/frs/download.php/581/orrery_2.4_clean.tar.gz]
+md5=03da10cffda64a0927a1d929c20eb8f8
+sha256=0a8fd606d12b98e439a95d608c317849b7fe151dca8e1b8b3dee329a3a75292b
+
 [http://download.savannah.nongnu.org/releases/linphone/ortp/sources/ortp-0.13.1.tar.gz]
 md5=293f16da6dd434e68652f0f725b7f97c
 sha256=2ba471a2a4f1d7f10fb70de5b68dbb7d32b43494efcecb88b3bd8445f630494c
@@ -21154,6 +21314,10 @@ sha256=a2d8473577c2b3b51ebf29e2c6cb31463158676a5d5b44438ff0db18e8aab949
 md5=1d5e267c57b126038689ce3bf26eea24
 sha256=468f25a70ef2dac90088caa6599c41ade6768e0cdc328dc3e82ab578903e69d4
 
+[http://projects.openmoko.org/frs/download.php/907/pisi-src-0.4.7.tar.gz]
+md5=8d47a6a2926c635cb4eb633e3ee063ce
+sha256=fd4d89c138ef2d1a6f9458cb85363581a205d1c1b69578fe7e0f856668a7fe9a
+
 [http://xorg.freedesktop.org/releases/individual/lib/pixman-0.10.0.tar.bz2]
 md5=fb23e17a8a0308e8fad6dc153753ba9a
 sha256=2b841f49b245948b8739e55f1b663687d5b33eb2767833574f9a1f0904a1d1e4
@@ -22030,6 +22194,10 @@ sha256=12527f130dd695184c44c6197deb619c26c9b5b31ce7699a5dd97e0ad2dd7bd1
 md5=d2aa74615aa9cf23413975a68613ffc1
 sha256=12527f130dd695184c44c6197deb619c26c9b5b31ce7699a5dd97e0ad2dd7bd1
 
+[http://twhiteman.netfirms.com/pyDES/pyDes-1.3.1.tar.gz]
+md5=e499fdde54e98be87324c0322311e034
+sha256=4f1aae18f2aabb3559b8878d95a7228ebe6633fc4a88905935354ccdf2accc32
+
 [http://downloads.sourceforge.net/pyopenssl/pyOpenSSL-0.6.tar.gz]
 md5=af67fda6d2125cae9c56ee50430a40c7
 sha256=58ee9dd10fbd97d65347626f60a38aafdcb05d19ad90c883c4284266ba7ec959
@@ -22230,6 +22398,10 @@ sha256=03a605f106e30bea448b04007635a21140eeaba4c8844188d661c3b133cbee89
 md5=89afe242275a3fce57b4ffb5fadc5888
 sha256=ab9ad4481af435894db27e78010f6bbc21c62252dbe7a254121453419edde8f5
 
+[ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.16/pygtk-2.16.0.tar.bz2]
+md5=bd0d437fefd6d5390f5d770a495cd50c
+sha256=7fae5e01af217a01738eae41c38ad7f86d1f538f444300d0fa2847aafb7444a8
+
 [ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.6/pygtk-2.6.3.tar.bz2]
 md5=5acd4a4f5807f93a80389c1e9af48808
 sha256=1cd8e9bb0a011317862aec90a03e562bebbbf7fcf865a8ff12992548cdda746d
@@ -22338,6 +22510,10 @@ sha256=703b204bd1d57b1bfc0ba95246d229a599259b782ee18072d6041656d412073b
 md5=499cfc69b3cacbdf70a32f253b4a0eb1
 sha256=cb5a5855c68743622b1902c7c106b30316c623c265906f2acb2fa2c9d97b3f37
 
+[http://handheldshell.com/software/pyring_1.1.10.tgz]
+md5=d6d2a16ccd1562b2ae63314f30a4ebf9
+sha256=45b73399b8affd1a81ecd370d37e066c046c49e1777b43d0affe6b520082a604
+
 [http://www.vanille.de/mirror/pyserial-2.0.tar.bz2]
 md5=a8db6163466c21845faa6ef57af992da
 sha256=df76084516b34b5e04dd84e54ef38613d87c56bc04de3d0a711f72fb6707ab0b
@@ -22386,6 +22562,10 @@ sha256=85bbe7a9fb6617e24bb4dbef528af8ef6eae07f8809dcd05ec926142feca7714
 md5=975e5449d6670dd19498bb9ec4856d39
 sha256=0d904161351a8e55b272ed9691b12dca4278bed62fde53ba2a36f479996db910
 
+[http://labix.org/download/python-dateutil/python-dateutil-1.4.1.tar.gz]
+md5=2a5f25ab12fcefcf0b21348f2d47595a
+sha256=74b615c6a55b4421187feba1633fc233e7c5ebdd7abe9b092447a32946823357
+
 [http://downloads.sourceforge.net/python-fam/python-fam-1.1.1.tar.gz]
 md5=f6c760c6d8e5ea69a3fce029f7973558
 sha256=139f069a4455560a8c68c4c18569f2cb453eeda33d522862f7a4af13932d9cdc
@@ -22426,6 +22606,10 @@ sha256=f1f472a698966b0350857b20fc7f6dd86e4a1f83870edfbe30eb36552b449680
 md5=7e4fc4b5382c6b54ede8b6e29270cba8
 sha256=f1f472a698966b0350857b20fc7f6dd86e4a1f83870edfbe30eb36552b449680
 
+[http://pypi.python.org/packages/source/p/python-ldap/python-ldap-2.3.9.tar.gz]
+md5=a9f9f16338288d118a1ae6266c993247
+sha256=62f75b21c5ee744408c9d8b59878328b3bdf47899d30e8abf0c09b3ffb893ed4
+
 [http://opensource.bolloretelecom.eu/files/python-netfilter-0.5.4.tar.gz]
 md5=2029edea09db0829f16b06042c0004ed
 sha256=1ef9ca0508159cc63e1cd097a204664b99eedfa596d326866c8fce9b30715379
@@ -22438,6 +22622,10 @@ sha256=bce93266c593d79d7083052a6cae516de3d6c3e5bda277f664785d30157b8ac7
 md5=0df3d1c5109bb88d06575d70513a190c
 sha256=8ff2ec30050803e8b60cfb05d24fa32b3d175bffb81ef5919c3db4ac0f263df8
 
+[http://pypi.python.org/packages/source/p/python-wifi/python-wifi-0.3.1.tar.gz]
+md5=0458e32f82900e03c9fd155442242638
+sha256=a7087ac16ce2d1f146dd76cbfc442ae5b91774f4b8c8eba913c09d0c325eb12f
+
 [http://download.sugarlabs.org/sources/external/python-xklavier/python-xklavier-0.2.tar.gz]
 md5=5b3cd1832f4d37dfa48490759f3bd3be
 sha256=b71096448ca9d7933fbc4aff13cef95a5878f49e4c25f20f815dd1f8f635b6d6
@@ -22854,6 +23042,10 @@ sha256=73fd760d3b5cbf06417576591dc37d67380d189392db9000c21b7cbebee49ffc
 md5=72811b7d7fecfbdca45d5a74394daa4f
 sha256=c3b9bffd3e27090d4c0623ef61f48257343d0f6ea1cf573f5296250ab7551e5d
 
+[http://download.savannah.nongnu.org/releases/qwo/qwo-0.5.tar.gz]
+md5=9e1f7394be0a2eb2891e915f594d5f95
+sha256=fbb416acee1f8fe56394f37074154138f3cf324f48ce611cc2df40eb73b5c9ff
+
 [http://downloads.sourceforge.net/qwt/qwt-4.2.0rc1.tgz]
 md5=142b10ab27e837c3c4603cf9a7e9343b
 sha256=3b6db68d53441119dced27e5bad26ec087294cb9d878d37bcea61e1f1e4849a1
@@ -23102,6 +23294,10 @@ sha256=17e1105cddd928adf7d47e050f9bb49557850687f800b3e24cbbf22933ff31ae
 md5=15faef2aba7b99782f3b0b8b5d30f80a
 sha256=17e1105cddd928adf7d47e050f9bb49557850687f800b3e24cbbf22933ff31ae
 
+[ftp://ftp.debian.org/debian/pool/main/r/resolvconf/resolvconf_1.45.tar.gz]
+md5=1f0b0bccb4dc0a762dacf6aca716e71d
+sha256=096a0696f925334f4f9fcc87df3305999f4b9f9d630fe6f2fa0179f3d56467f3
+
 [http://xlibs.freedesktop.org/release/resourceext-1.0.tar.bz2]
 md5=007713326ca5f1adfd39f3cb587c3b9b
 sha256=78e0a532bb84d6d85e90244bf3bb0ee9a5246545ebc9b677173e37e231d30cdc
@@ -23346,6 +23542,10 @@ sha256=257722380b39e84e700e9f2d2f6600ba724723f1ed59327bfce47a57d293eeee
 md5=3fbb02294a8ca33d4684055adba5ed6f
 sha256=19590e972b80333e26a6514c34d976c2037138361481a16f27b75e5d33f33a58
 
+[ftp://ftp.ruby-lang.org/pub/ruby/ruby-1.8.5.tar.gz]
+md5=3fbb02294a8ca33d4684055adba5ed6f
+sha256=19590e972b80333e26a6514c34d976c2037138361481a16f27b75e5d33f33a58
+
 [ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.6-p286.tar.gz]
 md5=797ea136fe43e4286c9362ee4516674e
 sha256=1774de918b156c360843c1b68690f5f57532ee48ff079d4d05c51dace8d523ed
@@ -24150,6 +24350,10 @@ sha256=7b408a4e7eb5c4fa6861e3d5f0b49f5ce872c87775fb302a7d36956b77f1e2b9
 md5=baa60d94d99c943b136347a5438ad708
 sha256=b1118e32a03c245fe1140f968fc6d045dae66a7c092f2e42274e9bae3b7b96b8
 
+[http://www.handheldshell.com/software/fso/sms-sentry_1.01.tgz]
+md5=4c21f533aebbe17105374ab0fbcfede3
+sha256=e6ea066943305025dd67e200b272f278911f474c30a4d54bb74268ea930f5130
+
 [http://www.linux-projects.org/downloads/sn9c102-1.32.tar.gz]
 md5=4d5b5bb9c70e69435a608c73da73b632
 sha256=780edfac5a67172a49bc4e8b1bd384fa9184ceaf55bf5ab002fd7b8415db7e3b
@@ -25062,6 +25266,10 @@ sha256=d2a107e3a5ceaeeb15ab2e3d7cd308653b4ded8aaf8d3c0e0be3b64ba4e17cfc
 md5=85755b15099f6071776d6feb67bdbca8
 sha256=e56a77325cdea8c274a39fcb79bd47919cbafa15d8009176538ec9a94f5e6e13
 
+[http://www.tangogps.org/downloads/tangogps-0.9.9.tar.gz]
+md5=0ff6bde0f33b712d066cea08934d4808
+sha256=e4f203a3370ef02684a320431cb71c28af3bc9084bd0af2d72889eb36a62da0d
+
 [http://downloads.sourceforge.net/tapioca-voip/tapioca-0.3.9.tar.gz]
 md5=e88c400394c092c2688bb2d490c80ccb
 sha256=fb89ac4e8578adc140e19cb4929b200d2898e5a8373230f500c16e59c803cba1
@@ -25850,6 +26058,10 @@ sha256=7b08bb8a98ad8a06e2cafda05ab21f2a69b2d64252dfc9435c93094d979e7c5a
 md5=75c74b9c8df7c83c8e3c3068fff08a82
 sha256=5fbd4053a4eb01b814799855e35a3c01743f98acf9fcd167522e6484a2edd7b7
 
+[ftp://elsie.nci.nih.gov/pub/tzdata2009r.tar.gz]
+md5=c38d977a3f9f4d4646cab902554c519e
+sha256=684d23e3ebe825c9db90732534446f4e33f5ad4455980b15fd9eb2e4ba5a6731
+
 [ftp://elsie.nci.nih.gov/pub/tzdata2009p.tar.gz]
 md5=e401e284512be17f5cf63ee52e4f3284
 sha256=7182ad6f03bfe16ccdbac4a3efb9e765ea7c51afc33c3a7fefb053122aa6da2c
@@ -26238,6 +26450,10 @@ sha256=c4bf829816c3e53b0807bb12cfdc8b1f0e0c1eae14a5be2ffb1a59ad71bbb188
 md5=261038b0a6890207b68a26be10a37822
 sha256=1d645fa76a9482a6630b9a7257d11eabfa94ef4337493ef7075e25cbb8820491
 
+[http://www.techiem2.net/files/usbmode.tar.gz]
+md5=1af56936129a4cf59487f8825cce44b6
+sha256=368b06259170e7e960c8ba4e344e6df45c85ac23476554e84fe9e53667dcfc0e
+
 [http://downloads.sourceforge.net/linux-usb/usbutils-0.70.tar.gz]
 md5=05276dc307a0297904bc892e9998bf59
 sha256=98d29c0c013debc32f1a17fd66f5e9248025959b07d13f1faba91aa5a1a9ba6b
@@ -26646,6 +26862,10 @@ sha256=bca8b0073d9527c0293b831c9b8d8f89fc3dc7b5ab30898e7b748843af07a978
 md5=511ffbc8ed8d9df82e7c67852164728c
 sha256=ee1faf72ef745a7d96e44cb4797d92a8cd2c9e290dfe602fae0fd955a11d4f3a
 
+[http://vobject.skyhouseconsulting.com/vobject-0.8.1c.tar.gz]
+md5=c9686dd74d39fdae140890d9c694c076
+sha256=594113117f2017ed837c8f3ce727616f9053baa5a5463a7420c8249b8fc556f5
+
 [http://gpephone.linuxtogo.org/download/gpephone/voicecall-0.1/voicecall-0.1.tar.gz]
 md5=7fa731310c2f5e334ca4eba9c5482965
 sha256=f6ddc993d4890b9500a63345f76acd3eb4a04a9190fcd055f323319627bf104e
@@ -26926,6 +27146,10 @@ sha256=e9152e09ff174fc4c4cd5ce00e52a15005c738c2a4c0de87f5ff24ca325f9b85
 md5=1fe3c7a2caa6071e071ba34f587e1555
 sha256=d78a1efdb62f18674298ad039c5cbdb1edb6e8e149bb3a8e3a01a4750aa3cca9
 
+[http://trac.hackable1.org/trac/raw-attachment/wiki/WooshBrowser/woosh-0.1.tar.gz]
+md5=3a9639e077c3d8f85bb59333ef14015b
+sha256=1e8d7eb70f349bfee9eb3f3cb2464c19a4229d0f7faa0a6962a3cd15a460b99f
+
 [http://hostap.epitest.fi/releases/wpa_supplicant-0.2.6.tar.gz]
 md5=7f83c74bf5e6db7dc564c391a44a9fe7
 sha256=f32c5e7607312d3650684977e6d1888a4a53cdb4ba16746225fab66cf345d55a
@@ -30646,6 +30870,10 @@ sha256=78b013e2e0bb4c1af1adbd7acca4299cd3d83e96d8da2731f629f562b5f153a6
 md5=791e8986c6e16dcd1c9878126725e06b
 sha256=eba57692dadd21df8d4afaea4daf8db5179c7398e11cd019fd462aa6947f4119
 
+[ftp://ftp.gnome.org/pub/gnome/sources/zenity/2.20/zenity-2.20.1.tar.bz2]
+md5=b9989582ea43f8fd58819d85ef9c9bc5
+sha256=cc3b203acbd745a7c3b6ea3d8e74d7fb07cf8f8aa92bcaa3b2edb023dee02a36
+
 [http://ftp.gnome.org/pub/GNOME/sources/zenity/2.20/zenity-2.20.1.tar.bz2]
 md5=b9989582ea43f8fd58819d85ef9c9bc5
 sha256=cc3b203acbd745a7c3b6ea3d8e74d7fb07cf8f8aa92bcaa3b2edb023dee02a36
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index bca98f1139..68afcd4398 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -42,10 +42,11 @@ SRCREV_pn-dbus-c++ ?= "13131"
 SRCREV_pn-dbus-c++-native ?= "13131"
 SRCREV_pn-dfu-util ?= "4160"
 SRCREV_pn-dfu-util-native ?= "4160"
+SRCREV_pn-disko ?= "f52597b8d5d584811cbe8f9e0bf25ea372526953"
 SRCREV_pn-diversity-daemon ?= "571"
 SRCREV_pn-diversity-radar ?= "453"
 SRCREV_pn-e-tasks ?= "14"
-SRCREV_pn-e-wm-config-illume-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
+SRCREV_pn-e-wm-config-illume-shr ?= "cb4159e653d770da8e8f9fc9a65135839533d4c5"
 SRCREV_pn-e-wm-illume-dict-pl ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
 SRCREV_pn-e-wm-menu-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
 SRCREV_pn-e-wm-sysactions-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb"
@@ -326,6 +327,7 @@ SRCREV_pn-u-boot-openmoko-devel ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19"
 SRCREV_pn-usbpath ?= "3172"
 SRCREV_pn-usbpath-native ?= "3172"
 SRCREV_pn-webkit-efl ?= "3a5ee77664c898ed51a2b2d5759822f8c0a06472"
+SRCREV_pn-wesnoth ?= "39828"
 SRCREV_pn-wlan-ng-modules ?= "1859"
 SRCREV_pn-wlan-ng-utils ?= "1859"
 SRCREV_pn-wmiconfig ?= "5394"
diff --git a/conf/distro/micro.conf b/conf/distro/micro.conf
index a1220ee592..25880dff9d 100644
--- a/conf/distro/micro.conf
+++ b/conf/distro/micro.conf
@@ -76,11 +76,13 @@ ${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}"
 #############################################################################
 PREFERRED_PROVIDER_task-bootstrap	= "task-bootstrap"
 PREFERRED_PROVIDER_virtual/libx11	= "libx11"
+PREFERRED_PROVIDER_virtual/gail         ?= "gtk+"
 #############################################################################
 # PREFERRED VERSIONS
 #############################################################################
 require conf/distro/include/sane-srcdates.inc
 require conf/distro/include/sane-srcrevs.inc
+require conf/distro/include/preferred-xorg-versions-X11R7.5.inc
 
 #############################################################################
 # NLS
@@ -99,6 +101,8 @@ PACKAGE_SNAP_LIB_SYMLINKS = "1"
 # Collapse /usr into /
 prefix = ""
 exec_prefix = ""
+prefix_native = ""
+exec_prefix_native = ""
 
 # Don't install ldconfig and associated gubbins
 USE_LDCONFIG = "0"
diff --git a/conf/machine/bug.conf b/conf/machine/bug.conf
index cec3d5b785..3e0389a6ba 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"
+MACHINE_EXTRA_RRECOMMENDS = "marvell-gspi-fw marvell-sdio-fw"
 PREFERRED_PROVIDER_virtual/kernel = "linux-bug"
 
 MACHINE_FEATURES = "kernel26 screen touchscreen hotplug alsa wifi usbhost usbgadget"