11 files changed, 224 insertions, 43 deletions
diff --git a/conf/checksums.ini b/conf/checksums.ini
index f2bf5c21c2..3d71cae95f 100644
--- a/conf/checksums.ini
+++ b/conf/checksums.ini
@@ -94,6 +94,10 @@ sha256=8f9124bd76c378ae2a25b6b421ebb8f0a88069da697ac6c96943571d93af8b15
 md5=8bd2a92fb94faa1b4fc43865d40bd988
 sha256=a317cd11719659892bdae6ec54ee2e37549d0df7d5bdce02036963acc2ad1486
 
+[http://divmod.org/trac/attachment/wiki/SoftwareReleases/Axiom-0.5.30.tar.gz?format=raw]
+md5=8f0b3a27770e487ad08f4fafdccc4495
+sha256=4a4217e70e01e11d357c2c2c23bc72d244a78fa40a401cca48cd5f0a619c7060
+
 [http://search.cpan.org/CPAN/authors/id/D/DC/DCLINTON/Cache-Cache-1.05.tar.gz]
 md5=09e4d37979c8f8ce2518e1d1ccd10d99
 sha256=10106d94e0897c18cd5eb0b782c3212371c9785eba78a15f4623335e01dda23c
@@ -186,6 +190,10 @@ sha256=f12ec5f0864d85268a8d67e4919cb7f3d7f0e06ed6cc278c952f6c342673d931
 md5=caea8bcfc9c1d391e56d85e437005a5d
 sha256=0875e553a17fe65e920ad810a67aa6faca582c53476d8dc75880a6b3da625d0b
 
+[http://directfb.org/downloads/Core/DirectFB-1.2.7.tar.gz]
+md5=59ca16f600e96c8c104a485ff7c322c6
+sha256=80ab8e34246a280bc380020cf331bcc0014cf816380cee3935ad455c108e661e
+
 [http://www.directfb.org/downloads/Extras/DirectFB-examples-0.9.25.tar.gz]
 md5=835e850fddba8d8214d39ddd0646c3e8
 sha256=f83af60d53ab4319e5d71a4459cc10464ffd683efabacd6bd773bb807f8771fa
@@ -194,6 +202,10 @@ sha256=f83af60d53ab4319e5d71a4459cc10464ffd683efabacd6bd773bb807f8771fa
 md5=0cdfb4dd248eada3dc35db4f8cf75f8d
 sha256=c54e779a720841126e23d692de85243e23b0d94fb7792a958b96b5bd097a8b85
 
+[http://www.directfb.org/downloads/Extras/DirectFB-examples-1.2.0.tar.gz]
+md5=ce018f681b469a1d72ffc32650304b98
+sha256=830a1bd6775d8680523596a88a72fd8e4c6a74bf886d3e169b06d234a5cf7e3e
+
 [http://media.djangoproject.com/releases/1.0/Django-1.0.tar.gz]
 md5=84d0490e4126f31d1c23f640e1e86f2f
 sha256=4c780b9e2906944ce02a9325b15f480d2bd4c0b12137f752aa4800c0f8563acf
@@ -202,6 +214,10 @@ sha256=4c780b9e2906944ce02a9325b15f480d2bd4c0b12137f752aa4800c0f8563acf
 md5=3bf4d8d285591a5b7f31170f9b87aba0
 sha256=c196988f55fc6633d9f9f6d9ddc2ae9b4dfa1f300edf4cbbad865c06a8656df7
 
+[http://divmod.org/trac/attachment/wiki/SoftwareReleases/Epsilon-0.5.11.tar.gz?format=raw]
+md5=39710dfdeb42e51c953b17b6cded163e
+sha256=a5907a3b7584d63be30b3f79b0422b2b0778e73c053be9ac5a11004f1c9097dc
+
 [http://search.cpan.org/CPAN/authors/id/P/PE/PEVANS/Error-0.17004.tar.gz]
 md5=4dfca8732331a4f79c6803c3bc6b722f
 sha256=f464f0068772c276b81a7345f6788bdc3a243c13de24563346043d049a5497ba
@@ -242,6 +258,10 @@ sha256=2c0de0243ce1853bf62ed9b2da122472b6682a117843af0cce4b4cf9588194ff
 md5=7030996497f3cf012bc9e99b4ca3e920
 sha256=be21e3d5fa2edd1f5ff5952f67e6574dae15a027b26415910dfe813902fd5985
 
+[http://downloads.sourceforge.net/freeimage/FreeImage3110.zip]
+md5=ad1db36414391417654ba7bf1c0277d3
+sha256=84021b8c0b86e5801479474ad9a99c18d121508ee16d363e02ddcbf24195340c
+
 [http://www.urban.ne.jp/home/kanemori/zaurus/FreeNote_1.12.0.tar.gz]
 md5=06b5aeb6cc97107090438a364f0ce89b
 sha256=e6a0a5b674c4803bfd1ffda9660c29f4399294623ed095b0d1c554367c7db73c
@@ -506,6 +526,10 @@ sha256=4ba65d64599ca6937b44b98d1efd04957278679ddd733081d0d8c2ecf6c0143b
 md5=64f780e7f95c252eaaed0201c3d9a4ca
 sha256=281234116b99b4c4b45fde038a435a0d26b7ee55beac0c351186b3f12c301659
 
+[http://divmod.org/trac/attachment/wiki/SoftwareReleases/Nevow-0.9.32.tar.gz?format=raw]
+md5=75828090af2b26f69fe4a7f148a400f6
+sha256=bc35ce187481db91f047055b3edbce49c14d291b1a2eb3e915e9c1c511620f9a
+
 [http://downloads.sourceforge.net/numpy/Numeric-23.7.tar.gz]
 md5=8054781c58ae9cf6fe498316860b5ea8
 sha256=33225097777e84dfed251aee1265a9c0dd0976854e83f60e778a670027b12e7c
@@ -934,6 +958,10 @@ sha256=9e488e3ee3fc0f56d8f8898f4729819512dd43afff0fba4e32390d1af4bd53d5
 md5=56df2ae66db57932515a491c03bf514f
 sha256=f3b2df3f4483752a42f1a775a1163da1f9e91bf5f19d302abc93544aca20d2cd
 
+[http://tmrc.mit.edu/mirror/twisted/Twisted/8.2/Twisted-8.2.0.tar.bz2]
+md5=c85f151999df3ecf04c49a781b4438d2
+sha256=e0602bb05e31f6100b6f9ab35cfa93ab9f7a1c50a351a0ddfcd236a923bddfb0
+
 [http://search.cpan.org/CPAN/authors/id/G/GA/GAAS/URI-1.35.tar.gz]
 md5=1a933b1114c41a25587ee59ba8376f7c
 sha256=1684cb64a6bd24e019532ae2e5d4a962d43d9215623e9d4dc77536f118fbf31b
@@ -1390,6 +1418,10 @@ sha256=db22b34c0bfcab8546632475c6de2c63990214fb8ae5e2ada565410a85e22134
 md5=e77887dbafc515c63feac84686bcb3bc
 sha256=384437f3c4eb7d53ad27fdadce6cbc295ef16653b7f7739a480d91c784082ec9
 
+[http://www.apache.org/dist/apr/apr-1.3.2.tar.bz2]
+md5=a0631c63640176371dd4a5bf13beeee8
+sha256=bb0c58efdd252fcaf6f0ff06681d0ebecbecbaa3864047f32dec7f82d1c4994c
+
 [http://www.apache.org/dist/apr/apr-1.3.3.tar.bz2]
 md5=2090c21dee4f0eb1512604127dcd158f
 sha256=d95f3b78366c86317043304864bb08cb836312c87ea7d142a4c02154e7e0dd37
@@ -1406,6 +1438,10 @@ sha256=7d70ff17bec733bdb04a6653a8e9c15ab7d88429dac91a4ae58c1db5caaee07f
 md5=c3702668a640be1695956115857ec22e
 sha256=8cd84eb2031a91572e1be2975f4171730a9be72c4cd88718c4c40ac7dc4fd7d3
 
+[http://www.apache.org/dist/apr/apr-util-1.3.4.tar.gz]
+md5=a10e2ca150ff07f484c724c36142211f
+sha256=3f07ffdb18fb853290c9b83e82cd5cae66b8fbc357bd391e846c0afdd24fed7e
+
 [ftp://ftp.debian.org/debian/pool/main/a/apt/apt_0.5.28.6.tar.gz]
 md5=26b37525371cdaaec552237e0667305d
 sha256=57de084860870cccf510de62eb8ded252f5951a6e59e34a963d61d69de3aff10
@@ -2142,6 +2178,10 @@ sha256=1b4a5b5e48ad5e61a21586b7b59d5c0a88691a981e73e2c6dc5868197461791b
 md5=b12426fd72bedf00c389a7fb458275a8
 sha256=5a4a5b82dd8f485b4fef941cc216eb052184cf138f72b512eb62d836b460acdb
 
+[http://downloads.sourceforge.net/bftpd/bftpd-2.3.tar.gz]
+md5=4ab1eb33135fa5eaaf050e6d3dd0b319
+sha256=0af27ca6c49f696c64bcfb3e50452cad240997993e0b7afb65624898d3d95ff2
+
 [http://download.blender.org/peach/bigbuckbunny_movies/big_buck_bunny_480p_surround-fix.avi]
 md5=ed7ed01e9aefba8ddd77c13332cec120
 sha256=40d1cf5bc8e1b0e55dac7bb2e3fbc2aea05b6679444864781299b24db044634f
@@ -2254,6 +2294,10 @@ sha256=6fe3c4b2d45a50582f832bc77deb4e3da74a15ea8e09dbb214b9c44e7c3378fc
 md5=9d22ee4dafa3a194457caf4706f9cf01
 sha256=487a33a452f0edcf1f8bb8fc23dff5c7a82edec3f3f8b65632b6c945e961ee9b
 
+[ftp://ftp.gnu.org/gnu/binutils/binutils-2.19.1.tar.bz2]
+md5=09a8c5821a2dfdbb20665bc0bd680791
+sha256=3e8225b4d7ace0a2039de752e11fd6922d3b89a7259a292c347391c4788739f6
+
 [ftp://ftp.gnu.org/gnu/binutils/binutils-2.19.tar.bz2]
 md5=17a52219dee5a76c1a9d9b0bfd337d66
 sha256=bd2ea10ffc2bf62a917b05f4fbe3d02212589c2bc177fa0c51a9c874d3da528a
@@ -2362,6 +2406,10 @@ sha256=ad1cbca751301b5b8c735509b905bf7642de6110ec3dda939153cbb9df6db8cb
 md5=4f0bd19dd04a32eba6149b82b26c3f30
 sha256=9e042fcf2d29a58bd60fe3743130095992c62da4c865d01e6fea2d8d6d20583a
 
+[http://www.kernel.org/pub/linux/bluetooth/bluez-4.29.tar.gz]
+md5=9198f428277693c16c212910996075b4
+sha256=4fe29e8b7c28e6802853867531307704a78f69f37a09d7565268141a2a462644
+
 [http://www.kernel.org/pub/linux/bluetooth/bluez-4.7.tar.gz]
 md5=2aa806940d2c841e57a9b2ab7302b750
 sha256=ed384dea4f5f21157758fcd7db64db19ce0b410509c26630706e4a3c779287a0
@@ -2718,6 +2766,26 @@ sha256=cf3957b4548df051cd0971d179cb92dc0fcab3839977ddb70aae81c14cd04b03
 md5=d113f2777e4f508faa8b674ece87a37b
 sha256=f2b433270f22aad86f61cef61d95338aaa63dbe2f9468b9ed5defd1c01c9645f
 
+[http://busybox.net/downloads/fixes-1.13.2/busybox-1.13.2-depmod.patch]
+md5=7c9dfb5dcd66a1d6e837e72ad0cb05d4
+sha256=35e3854599a074ce1b47872ab1b97a625ed7d1ab3345b918f7f60524f5e390c5
+
+[http://busybox.net/downloads/fixes-1.13.2/busybox-1.13.2-init.patch]
+md5=7afb3a1b474742bc198b3c8450ab9a7e
+sha256=39a8efb5a50c56feb733e519365b4e188c25c0e925a1a63cc1ace9735a80100f
+
+[http://busybox.net/downloads/fixes-1.13.2/busybox-1.13.2-mdev.patch]
+md5=a72d169e9545e26257032e0e367feb95
+sha256=fd4a64c6a83e07586de0360258162c5bf431f164b3980301185743e4029940df
+
+[http://busybox.net/downloads/fixes-1.13.2/busybox-1.13.2-modprobe.patch]
+md5=6eeb6efcd71e57082d6654a9a6a368eb
+sha256=a02007661cf2f318a66468456f8fc8ae1177e12c3c66c59ff2de4d98863a388e
+
+[http://busybox.net/downloads/fixes-1.13.2/busybox-1.13.2-tar.patch]
+md5=90d093817855bc63ad16fbb8524f80df
+sha256=9427fa9b45f3c322bf4fe2463c99c972e6ae03df630899b38be4f29133708a0e
+
 [http://www.busybox.net/downloads/busybox-1.13.2.tar.gz]
 md5=aeb526108f13b91c02b115c8d86f9659
 sha256=03fc9dbdc6f44afd2da55c0ab36646d2d063708cc35f3f4569b913b064f11d83
@@ -2786,6 +2854,10 @@ sha256=624381208d0faae6c123bc6198a59d6c4316cd4fffb1ba5aca206374f5a42df6
 md5=53c44b73aa67d5e0282adfe928f3ba44
 sha256=624381208d0faae6c123bc6198a59d6c4316cd4fffb1ba5aca206374f5a42df6
 
+[ftp://invisible-island.net/byacc/byacc-20081225.tgz]
+md5=b9715b9a2867c221176b597e8f73cbc9
+sha256=1364c7fe382de659e8b9841a1736b645345a460d2f4302303e80c02235a2a575
+
 [http://downloads.sourceforge.net/bzflag/bzflag-1.10.6.20040515.tar.bz2]
 md5=8e3e5fbef3cfa21079eb06269e6b3d8b
 sha256=0329e3d0a59e9cc167733ed2b89a0dc2249725642a065cfd385bf1206fe30b19
@@ -3390,6 +3462,10 @@ sha256=905ee280a38f479ab7da75e6dfba21f221b23bb068111ebddc4c2e853f3fff09
 md5=c8be31ffebdae0e007ea587a11994e75
 sha256=64dfe89e56167bde80c6a18831b5a4259215c78c34ca16f4cb9fde10ffe54437
 
+[http://pypi.python.org/packages/source/C/ConfigObj/configobj-4.5.3.tar.gz]
+md5=6e2b37301439705831bd510d2a198431
+sha256=4276fcc96d81f0ba923f3a8c44c3cb55ac72c00fa79d35f1e3ccb4d410b3d7c5
+
 [http://download.savannah.gnu.org/releases/confuse/confuse-2.5.tar.gz]
 md5=4bc9b73d77ebd571ac834619ce0b3582
 sha256=65451d8d6f5d4ca1dbd0700f3ef2ef257b52b542b3bab4bbeddd539f1c23f859
@@ -3402,6 +3478,10 @@ sha256=1d56be1036de59926548e3defa4b9af894af9e2121d3598da13769da5c0f55b1
 md5=094743343e062ea370fcd461aa48a7fe
 sha256=bba3adf21a59f5836b1ba2615894e891627d9bcc863525f1892bc36e4e76124e
 
+[http://repo.moblin.org/connman/releases/connman-0.10.tar.gz]
+md5=094743343e062ea370fcd461aa48a7fe
+sha256=bba3adf21a59f5836b1ba2615894e891627d9bcc863525f1892bc36e4e76124e
+
 [ftp://ftp.moblin.org/connman/releases/connman-0.2.tar.gz]
 md5=bf48aa07d3c1e5fe272c7f139bc01fc9
 sha256=eacc3c57cffb411b09d834d2225323cde5676165b5d2fc2a27b16cde98e3ba97
@@ -3422,6 +3502,10 @@ sha256=9c626bda7e2cc460cdbfe9a14c13208253de6922a341ef60ba51a673c0317996
 md5=c9a3b384f080ed4cdf139ce9377ef2c8
 sha256=d7acac8bc0a38dfcab098137a76f5e9f4ce30ca86e82b26540502658e6b4e4a7
 
+[http://repo.moblin.org/connman/releases/connman-gnome-0.4.tar.gz]
+md5=c9a3b384f080ed4cdf139ce9377ef2c8
+sha256=d7acac8bc0a38dfcab098137a76f5e9f4ce30ca86e82b26540502658e6b4e4a7
+
 [http://www.conserver.com/conserver-8.1.14.tar.gz]
 md5=f7825728e5af8992ed4a99fb560a3df8
 sha256=48a9e2f8a02054bc6740ae354433bfa1636a6e726f2d62af22752d7a6103410b
@@ -3910,6 +3994,14 @@ sha256=4a319a08ae0838234f5b6fbd0b4d2e0fac7560a7553a4e1b043527cc17032aa3
 md5=537cda2dff7dfaf87660fee91b2cf78f
 sha256=bd7ce3b854678209e8624698a4000d3e5337339c3825c58a4b3a0a2fbf1a7819
 
+[http://downloads.sourceforge.net/ddccontrol/ddccontrol-0.4.2.tar.bz2]
+md5=b0eb367f3bc0564bd577e38d0b4107fc
+sha256=986f3b4b27ec04e1da493de3aaab01cd5ea9566d7572c1a40b8d43cd7a491e84
+
+[http://downloads.sourceforge.net/ddccontrol/ddccontrol-db-20061014.tar.bz2]
+md5=91951918e5bc553c251776cdff8cea9c
+sha256=ff88f8e5122a2ab7b69a961f267f74d09ec7c54e90453ee80930edf66955c7b8
+
 [http://downloads.sourceforge.net/ddclient/ddclient-3.6.3.tar.bz2]
 md5=42a3a420e492c0111adc58ac08ff6d04
 sha256=28be7102bde3bc9b39be2732b89da9fbab79b7ac3898075ed414a45258bb3026
@@ -4618,6 +4710,10 @@ sha256=fefd63c13ca28713f7f03320c1e341430ea2d016d3ab3e49163a12f4df2123e7
 md5=ec8690ff84b364d2df5b2443a01ba529
 sha256=e0360be0eecee68649246c022825dd5422f895958ffa736886dd2a0b9ec7ebda
 
+[http://effbot.org/media/downloads/elementtree-1.2.7-20070827-preview.zip]
+md5=30e2fe5edd143f347e03a8baf5d60f8a
+sha256=5071431068c58c1f56dcc8fff37f8a213351f3b45c012d3adb640ec9418053ad
+
 [http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles/elfutils-0.108.tar.gz]
 md5=fd318a634c8f67c7ac8a975f16965cc3
 sha256=794070c8108a2d8b7c6890ba42edb37510cc845bf601517cf4a0ea5443dfde29
@@ -6370,6 +6466,10 @@ sha256=00f2b73fea5eff79ae26338928187f956427421bc70ddab0ab63fe5a58112b87
 md5=1939de5fe43d12884d85fa5d7797e3c2
 sha256=243dabf3c45530cac8be092f9a1d838a46b46a92d4138870423006ffd6ae4001
 
+[http://gdata-python-client.googlecode.com/files/gdata.py-1.2.4.tar.gz]
+md5=521f33a377d64f8a6505ba119415b787
+sha256=fc5ddb8f76b17abd728721a0e0177ea35f55a70106f44dc9010b22eceb06abde
+
 [ftp://ftp.gnu.org/gnu/gdb/gdb-6.3.tar.gz]
 md5=812de9e756d53c749ea5516d9ffa5905
 sha256=c06bf9715436b3a28c189163aa5ca42b46af8286659827f033eaaf7d8b1fc342
@@ -10070,6 +10170,10 @@ sha256=a5d9fd696d7ee4a1c7679b5a688155bc1e0abbdf5f144d6762dbbee874df235f
 md5=03a0f63b997ce7b83a1eeaa6b80f4388
 sha256=a5d9fd696d7ee4a1c7679b5a688155bc1e0abbdf5f144d6762dbbee874df235f
 
+[http://jackaudio.org/downloads/jack-audio-connection-kit-0.116.2.tar.gz]
+md5=9c0ae9880e9b6e081f1a238fe6a28bd5
+sha256=ce6e1f61a3b003137af56b749e5ed4274584167c0877ea9ef2d83f47b11c8d3d
+
 [http://downloads.sourceforge.net/jackit/jack-audio-connection-kit-0.99.0.tar.gz]
 md5=a891a699010452258d77e59842ebe4a0
 sha256=2096acc56c314e689faad0036bbc1d86dea1b9d9620f711d471de76b1dd6859e
@@ -10358,6 +10462,10 @@ sha256=61a918b38a4b0b97e1469cbe3d9c4307af956bd95abec2067aa2fd278739cd96
 md5=b4a4509ca3f546cfedd23aa6f99ab81d
 sha256=b8c9d3a51f04bdecabbb4135079d408e02c98cdf3156bab8418a6830cb64b890
 
+[http://projects.linuxtogo.org/frs/download.php/226/kexecboot-0.5.tar.gz]
+md5=a937303d7ef3fc645f9dccf89e1494e2
+sha256=49c95d62e32b66c9f97e791f667afa82f0714bc0a0e0ad48df010f4f36de42ab
+
 [http://gpe.linuxtogo.org/download/source/keylaunch-2.0.10.tar.gz]
 md5=2d81de20b26eac5ad44b759eb412e8eb
 sha256=38715fcc508740deb3f169a01092f03ea4ce92c9ec3c2589a9510534aa52a540
@@ -11310,6 +11418,14 @@ sha256=5fdaf9af5ac4f75c0215d000b82b128fd054a582f81cc4f039a1e7fe69335ebb
 md5=15de3830b751818a54a42899bd3ae72c
 sha256=5fdaf9af5ac4f75c0215d000b82b128fd054a582f81cc4f039a1e7fe69335ebb
 
+[http://libchamplain.pierlux.com/release/0.2.8/libchamplain-0.2.8.tar.gz]
+md5=fa4a620efa1a1c1036b6701b7d4dafe1
+sha256=01e17811a85e93e5158f5d721b9b1b249db44683735a172fa0debd9759d3175c
+
+[http://libchamplain.pierlux.com/release/0.2.8/libchamplain-gtk-0.2.8.tar.gz]
+md5=c3e62c1912c0dba013c8f3df28fc809d
+sha256=03d751bd836174e2d6766d8036fc72e130dd090b13256d40a58ba6ab659475ef
+
 [http://gpephone.linuxtogo.org/download/gpephone/libchenabler-0.1/libchenabler-0.1.tar.gz]
 md5=866fd13611a8de946428db1df9be8468
 sha256=74def55ba6a61e966e0873a4081fd3dd65089b94b837810d3bc056221d7e41c7
@@ -15254,6 +15370,10 @@ sha256=c1454fdf5d3658f492253106c12bbf89a3bcc5789c36851a5f2f345d61a4ac0c
 md5=115dc5380ffdb03ec2e71ff9d6d97e72
 sha256=50bfab6d4b1b9af37ca6832b979f5c891f2dd9259a68700b37214d7897927c17
 
+[http://www.mumpot.org/download/mumpot-0.4.tar.gz]
+md5=52d1e64c63d70604f13985f1f326a802
+sha256=302bea9f0903fecf13ee0e9c24ed090203f2c77f7164a2a0f68c35fc8e1b9f10
+
 [http://www.dotaster.com/~shuu/linux/murasaki/0.8/8/murasaki-0.8.8.tar.gz]
 md5=ea7afa7e0bd9cfa0df7c04a9b270df88
 sha256=2033168723ffd612336acb8a64b33fcd91f7dedeaf78949d3dfce231cb962ce9
@@ -15614,6 +15734,10 @@ sha256=53d2f92c3d14423b49c2ff077855cf3987d38def963c82fd26fba5de379ca540
 md5=139a1ed50a1a12e47b1f7deedf4f40c3
 sha256=4310a3a526ae5461e17f57353fc29f71d13820a215eaa62c629190cc2a026173
 
+[http://downloads.pf.itd.nrl.navy.mil/olsr/nrlolsrdv7.8.1.tgz]
+md5=46291de38362acdcd335bcf259055046
+sha256=0e6b18e3bf77dd20395881535e3e7043bcd5171c220728310215d708f44f3b1c
+
 [http://www.nlnetlabs.nl/downloads/nsd/nsd-2.0.0.tar.gz]
 md5=a09542645b91ff60564b0f4db436af01
 sha256=8f486c4ef4d3f60fba4e0f855399184ca557f03a747cae6adde4cc2dffc53ff2
@@ -15790,6 +15914,10 @@ sha256=3b46936339fe5c2dcb8fb2f9213fa36dcddefaa1e00d1d93b5640d8cc9898ca1
 md5=b374415d7f5d485993fa697ab9a678b4
 sha256=3b46936339fe5c2dcb8fb2f9213fa36dcddefaa1e00d1d93b5640d8cc9898ca1
 
+[http://downloads.sourceforge.net/ogre/ogre-v1-6-1.tar.bz2]
+md5=6fbd72e81dd4c135a2cc4f78d596aeb4
+sha256=68b8978071f31615ad89119583e629ca7c3069ae0c2fb8f7c390c19807cce0bb
+
 [http://www.olsr.org/releases/0.4/olsrd-0.4.10.tar.bz2]
 md5=9807d4451e65cb4ec385155eef7bf3cf
 sha256=af04bdd8abd85bb4715fd6011566054847c75fcbac5e5e9cdee80858ac2957d3
@@ -16718,6 +16846,10 @@ sha256=8817295a7db11f31837c7c23f49e768131700b2b729d9fc724520d94a8b00f4b
 md5=10bab01d3c8856426cdf79f124fd4173
 sha256=61fd2a9225aad67d4e21727a297e571ddd6a973b845646cf10b24a92b88467bc
 
+[ftp://ftp.kernel.org/pub/software/utils/pciutils/pciutils-3.1.2.tar.bz2]
+md5=46387fd7a18c33fbb5311fdb3ab9ea12
+sha256=f66e40b8df5a7b6a93c463b0fb734ea6451c5f0c2cc772f58640b6c7f0d69397
+
 [http://downloads.sourceforge.net/pcmanfm/pcmanfm-0.3.0.1.tar.gz]
 md5=ac676498175495a37bef0b41bca9ace9
 sha256=1f7dec1a275774cb6eff9a491b74bbea7a2276140d640c15ed260c798c8334ed
@@ -19778,6 +19910,10 @@ sha256=ec3159feae5324e78f7fc09f8f534bd6a3e7ed735144ee8a8e9e7871e77115e0
 md5=c252e5286b142afa54ca49829c51a33f
 sha256=ec3159feae5324e78f7fc09f8f534bd6a3e7ed735144ee8a8e9e7871e77115e0
 
+[http://downloads.sourceforge.net/squashfs/squashfs3.3.tgz]
+md5=95c40fca0d886893631b5de14a0af25b
+sha256=8423027a1e7dc238d27ec227f47ce22d1317b4c9a0a9ee49a38b6e6f8da8a5c8
+
 [http://heanet.dl.sourceforge.net/squashfs/squashfs3.3.tgz]
 md5=95c40fca0d886893631b5de14a0af25b
 sha256=8423027a1e7dc238d27ec227f47ce22d1317b4c9a0a9ee49a38b6e6f8da8a5c8
@@ -21818,6 +21954,10 @@ sha256=f91445e5e1a02ee16f0bc1eb31a1cdfa53c4bb1e1cb4f76fae33436d472e9345
 md5=c990186db06cf188cb267d12bc21e2da
 sha256=f91445e5e1a02ee16f0bc1eb31a1cdfa53c4bb1e1cb4f76fae33436d472e9345
 
+[http://downloads.sourceforge.net/witty/wt-2.2.3.tar.gz]
+md5=2f4c34f1e092451d3c4d2e7f8c250015
+sha256=c6f692956d93765f12402a0b22617566decc52a9bb1a707b4e8d12affd1528d3
+
 [http://downloads.sourceforge.net/wvware/wv-1.2.0.tar.gz]
 md5=b6319d5e75611fe2210453b5feb82c0c
 sha256=a76f44468e78591e6d510d326702e7c3999d2b9dd3ab8ab8c1c9811fd5b111e4
@@ -25054,6 +25194,10 @@ sha256=f684397ce39ec400ba3369521892b7c3a8711d3ef1be59115db9f8d57707bbb8
 md5=4943ab7aa141af2c339266cd66b05c74
 sha256=5cc1a53bb909922596bdd0fa967b654fe1bfbe0dcf1d34608f0b7c90e0c27867
 
+[http://downloads.sourceforge.net/zziplib/zziplib-0.13.49.tar.bz2]
+md5=5f7b88ebb2bcd7e8044328482d079661
+sha256=f57c4e33eb2cdd87a6c2f01bfa4794340fbe61ea1a1cfc7dac3b6671e1dd22af
+
 [http://heanet.dl.sourceforge.net/zziplib/zziplib-0.13.49.tar.bz2]
 md5=5f7b88ebb2bcd7e8044328482d079661
 sha256=f57c4e33eb2cdd87a6c2f01bfa4794340fbe61ea1a1cfc7dac3b6671e1dd22af
diff --git a/conf/distro/include/preferred-gpe-versions-2.8.inc b/conf/distro/include/preferred-gpe-versions-2.8.inc
index 55e51409be..0bcd834b1a 100644
--- a/conf/distro/include/preferred-gpe-versions-2.8.inc
+++ b/conf/distro/include/preferred-gpe-versions-2.8.inc
@@ -78,7 +78,7 @@ PREFERRED_VERSION_gpe-synctool ?= "0.2"
 PREFERRED_VERSION_gpe-announce ?= "0.13"
 PREFERRED_VERSION_gpe-timesheet ?= "0.32"
 PREFERRED_VERSION_gpe-irc ?= "0.08"
-PREFERRED_VERSION_starling ?= "0.2"
+PREFERRED_VERSION_starling ?= "0.9"
 PREFERRED_VERSION_gpe-keylock ?= "0.12"
 PREFERRED_VERSION_gpe-ownerinfo ?= "0.28"
 PREFERRED_VERSION_gpe-question ?= "0.04"
diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index 8bcb65542d..433dc0d6e5 100644
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -18,7 +18,7 @@ PREFERRED_VERSION_aliens-qt ?= "1.0.0"
 PREFERRED_VERSION_alsa-lib ?= "1.0.15"
 PREFERRED_VERSION_alsa-oss ?= "1.0.15"
 PREFERRED_VERSION_alsa-plugins ?= "1.0.14"
-PREFERRED_VERSION_alsa-state ?= "0.1.0"
+PREFERRED_VERSION_alsa-state ?= "0.2.0"
 PREFERRED_VERSION_alsa-utils ?= "1.0.15"
 PREFERRED_VERSION_anthy ?= "7811"
 PREFERRED_VERSION_anthy-native ?= "7811"
@@ -175,7 +175,7 @@ PREFERRED_VERSION_comprec ?= "0.02"
 PREFERRED_VERSION_confuse ?= "2.5"
 PREFERRED_VERSION_confuse-native ?= "2.5"
 PREFERRED_VERSION_connect ?= "0.1"
-PREFERRED_VERSION_connman ?= "0.8"
+PREFERRED_VERSION_connman ?= "0.10"
 PREFERRED_VERSION_conserver ?= "8.1.14"
 PREFERRED_VERSION_console-tools ?= "0.3.2"
 PREFERRED_VERSION_contacts ?= "0.7"
@@ -281,7 +281,7 @@ PREFERRED_VERSION_dvb-image ?= "1.0"
 PREFERRED_VERSION_dvbtraffic ?= "0.0cvs20060814"
 PREFERRED_VERSION_dviviewer ?= "1.0.2"
 PREFERRED_VERSION_e2fsprogs ?= "1.38"
-PREFERRED_VERSION_e2fsprogs-libs ?= "1.42.2"
+PREFERRED_VERSION_e2fsprogs-libs ?= "1.41.2"
 PREFERRED_VERSION_e2fsprogs-libs-native ?= "1.35"
 PREFERRED_VERSION_e2fsprogs-native ?= "1.38"
 PREFERRED_VERSION_e2tools ?= "0.0.16"
@@ -589,7 +589,7 @@ PREFERRED_VERSION_gpicview ?= "0.1.5"
 PREFERRED_VERSION_gpm ?= "1.20.1"
 PREFERRED_VERSION_gpp ?= "2.21"
 PREFERRED_VERSION_gpsbabel ?= "1.3.3"
-PREFERRED_VERSION_gpsd ?= "2.34"
+PREFERRED_VERSION_gpsd ?= "2.37"
 PREFERRED_VERSION_gpsdrive ?= "2.10pre4"
 PREFERRED_VERSION_gpstk ?= "1.2"
 PREFERRED_VERSION_gqview ?= "2.1.1"
@@ -659,7 +659,7 @@ PREFERRED_VERSION_hexatrolic ?= "1.0beta3"
 PREFERRED_VERSION_hfsplusutils ?= "1.0.4-4"
 PREFERRED_VERSION_hfsutils ?= "3.2.6"
 PREFERRED_VERSION_hibernate-script ?= "1.12"
-PREFERRED_VERSION_hicolor-icon-theme ?= "0.9"
+PREFERRED_VERSION_hicolor-icon-theme ?= "0.10"
 PREFERRED_VERSION_hiker ?= "0.9.1"
 PREFERRED_VERSION_hildon-base-lib ?= "0.11.1"
 PREFERRED_VERSION_hildon-control-panel ?= "0.9.1-1.2"
@@ -1523,7 +1523,7 @@ PREFERRED_VERSION_python-logilab-common ?= "0.9.3"
 PREFERRED_VERSION_python-lxml ?= "1.3.3"
 PREFERRED_VERSION_python-mad ?= "0.6"
 PREFERRED_VERSION_python-mysqldb ?= "1.2.1"
-PREFERRED_VERSION_python-native ?= "2.5.1"
+PREFERRED_VERSION_python-native ?= "2.6.1"
 PREFERRED_VERSION_python-numarray ?= "1.1.1"
 PREFERRED_VERSION_python-numeric ?= "23.7"
 PREFERRED_VERSION_python-ogg ?= "1.3"
@@ -1554,9 +1554,9 @@ PREFERRED_VERSION_python-pyrad ?= "0.8"
 PREFERRED_VERSION_python-pyraf ?= "1.4"
 PREFERRED_VERSION_python-pyreverse ?= "0.5.2"
 PREFERRED_VERSION_python-pyrex ?= "0.9.8.4"
-PREFERRED_VERSION_python-pyrex-native ?= "0.9.8.4"
+PREFERRED_VERSION_python-pyrex-native ?= "0.9.8.5"
 PREFERRED_VERSION_python-pyro ?= "3.7"
-PREFERRED_VERSION_python-pyserial ?= "2.2"
+PREFERRED_VERSION_python-pyserial ?= "2.4"
 PREFERRED_VERSION_python-pytester ?= "0.6.0"
 PREFERRED_VERSION_python-pythondaap ?= "0.4"
 PREFERRED_VERSION_python-pyvisa ?= "1.1"
@@ -1569,7 +1569,7 @@ PREFERRED_VERSION_python-scapy ?= "1.1.1"
 PREFERRED_VERSION_python-scons ?= "0.97"
 PREFERRED_VERSION_python-scons-native ?= "0.97"
 PREFERRED_VERSION_python-setuptools ?= "0.6c8"
-PREFERRED_VERSION_python-setuptools-native ?= "0.6c8"
+PREFERRED_VERSION_python-setuptools-native ?= "0.6c9"
 PREFERRED_VERSION_python-sgmlop ?= "1.1"
 PREFERRED_VERSION_python-simplejson ?= "1.7.1"
 PREFERRED_VERSION_python-snmplib ?= "0.1.1"
@@ -1933,7 +1933,7 @@ 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-native ?= "0.5.1"
+PREFERRED_VERSION_vala-native ?= "0.5.6"
 PREFERRED_VERSION_vde ?= "2.0.2"
 PREFERRED_VERSION_vectoroids ?= "1.1.0"
 PREFERRED_VERSION_videoplayer ?= "0.1"
diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 077cb85775..ecc3d0917e 100644
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -22,6 +22,9 @@ SRCREV_pn-bootchart-lite ?= "4"
 SRCREV_pn-clutter-box2d ?= "3197"
 SRCREV_pn-clutter-cairo ?= "3210"
 SRCREV_pn-clutter-gst ?= "3188"
+SRCREV_pn-clutter-gtk-0.6 ?= "2ba362a1a223c2b28541030a80aa11191615340a"
+SRCREV_pn-clutter-gtk-0.8 ?= "7d3c3230376e731c06c21afa9d8c1d44dbea27cd"
+SRCREV_pn-clutter-gtk ?= "70f4b0cbd568dfa265484a03be3bd08ad15ed12e"
 SRCREV_pn-clutter ?= "3240"
 SRCREV_pn-comic-reader ?= "54"
 SRCREV_pn-connman ?= "103706c4f4da0c89f8b6f33cccdc3149f4ecc09a"
@@ -43,6 +46,7 @@ SRCREV_pn-exalt ?= "79"
 SRCREV_pn-exalt-daemon ?= "78"
 SRCREV_pn-exalt-module ?= "78"
 SRCREV_pn-ezx-boot-usb-native ?= "2371"
+SRCREV_pn-ezx-gen-blob ?= "2390"
 SRCREV_pn-ezxd ?= "2074"
 SRCREV_pn-elf2flt ?= "1786"
 SRCREV_pn-epiphany ?= "7837"
@@ -50,14 +54,15 @@ SRCREV_pn-epydial ?= "215"
 SRCREV_pn-etk-theme-ninja ?= "5"
 SRCREV_pn-fbgrab-viewer-native ?= "1943"
 SRCREV_pn-flashrom ?= "3682"
-SRCREV_pn-frameworkd ?= "b10138017b9fcf4dac8d16f22a184c333ddab9ab"
+SRCREV_pn-frameworkd ?= "700ab8250582767628165b7cf6f671ef756ba56d"
 SRCREV_pn-frameworkd-devel ?= "${SRCREV_pn-frameworkd}"
 SRCREV_pn-fsod ?= "3fa5eb6f2edcf7c9f0fc2027fda47b91d9f0f136"
+SRCREV_pn-fso-abyss ?= "4afeacb21c3d4193289e2b7db549a91751d75195"
 SRCREV_pn-fso-apm ?= "eb39ce7fb81bfa64e1a9eb5f142ca3d1065be3fa"
-SRCREV_pn-fso-gpsd ?= "15f75f335efb52dd50a22a05f47a0f63eb07378b"
+SRCREV_pn-fso-gpsd ?= "78fe48dffb923175bde9f0aabc3500a9264a57e0"
 SRCREV_pn-fso-gsm0710muxd ?= "abcbcd7cc532a8834906de3fc24c8f8fe7643cd4"
-SRCREV_pn-fso-monitord ?= "31b4d3d1a40b1cc2cbe186e5ea80490a0c80b55f"
-SRCREV_pn-fso-sounds ?= "b24d3c2e66fee10a5e288101cd1b6f5bbd3da7e2"
+SRCREV_pn-fso-monitord ?= "6a7860dc09a18144e8e363e64b2eb881bba83728"
+SRCREV_pn-fso-sounds ?= "3d2cf5231cb0e81770a246530574142bd2b8bbff"
 SRCREV_pn-fstests ?= "204"
 SRCREV_pn-gconf-dbus ?= "641"
 SRCREV_pn-gnuradio ?= "10302"
@@ -96,7 +101,7 @@ SRCREV_pn-linux-hackndev-2.6 ?= "1308"
 SRCREV_pn-linux-ixp4xx ?= "1085"
 SRCREV_pn-linux-openmoko-2.6.24 ?= "fb42ce6724576fc173faf8abfb04aa2c36d213b7"
 SRCREV_pn-linux-openmoko-2.6.28 ?= "34240a1c06ae36180dee695aa25bbae869b2aa26"
-SRCREV_pn-linux-openmoko-devel ?= "34240a1c06ae36180dee695aa25bbae869b2aa26"
+SRCREV_pn-linux-openmoko-devel ?= "498d0953423a504cd24d11a0307e0ec01b81b68d"
 SRCREV_pn-linux-eten ?= "ab2d414f4f13816af0ec0401b608133ca946624a"
 SRCREV_pn-llvm-gcc4 ?= "374"
 SRCREV_pn-llvm-gcc4-cross ?= "374"
@@ -171,7 +176,7 @@ SRCREV_pn-openmoko-theme-standard2 ?= "4338"
 SRCREV_pn-openmoko-theme-standard2-qvga ?= "3425"
 SRCREV_pn-openmoko-today2 ?= "4168"
 SRCREV_pn-openmoko-today2-folders ?= "3704"
-SRCREV_pn-openmoko-toolchain-scripts ?= "4878"
+SRCREV_pn-openmoko-toolchain-scripts ?= "4913"
 SRCREV_pn-openmoko-worldclock2 ?= "3365"
 SRCREV_pn-openocd ?= "517"
 SRCREV_pn-openocd-native ?= "517"
@@ -185,12 +190,13 @@ SRCREV_pn-packagekit ?= "813fa8cfb139246cf180d52895b52b28616ae2f5"
 SRCREV_pn-paroli ?= "9279b50ed72a94100d7f0f49090043134302f2eb"
 SRCREV_pn-portaudio-v19 ?= "1387"
 SRCREV_pn-psplash ?= "249"
-SRCREV_pn-pty-forward-native ?= "4214"
+SRCREV_pn-pty-forward-native ?= "4907"
 SRCREV_pn-pyefl-sudoku ?= "49"
 SRCREV_pn-pygsm ?= "976477f6b403f422b4ea730f71ebf409f6671141"
 SRCREV_pn-pylgrim ?= "20"
 SRCREV_pn-pyneod ?= "41de4d538b50b27ab2a2f5aae1a180b880a05b6a"
 SRCREV_pn-pyneog ?= "41de4d538b50b27ab2a2f5aae1a180b880a05b6a"
+SRCREV_pn-python-coherence ?= "1154"
 SRCREV_pn-python-connexion ?= "1439"
 SRCREV_pn-python-formencode ?= "3148"
 SRCREV_pn-python-gsmd ?= "148"
@@ -205,7 +211,7 @@ SRCREV_pn-qi ?= "ed52486b43dca91891305b9e832c8366a2742798"
 SRCREV_pn-remoko ?= "121"
 SRCREV_pn-remoko-server ?= "121"
 SRCREV_pn-s3c24xx-gpio ?= "4130"
-SRCREV_pn-serial-forward ?= "4214"
+SRCREV_pn-serial-forward ?= "4907"
 SRCREV_pn-settings-daemon ?= "2006"
 SRCREV_pn-sjf2410-linux-native ?= "4268"
 SRCREV_pn-socketcan-modules ?= "917"
@@ -222,7 +228,7 @@ SRCREV_pn-uclibc ?= "24279"
 SRCREV_pn-uclibc-initial ?= "24279"
 SRCREV_pn-usbpath ?= "3172"
 SRCREV_pn-usbpath-native ?= "3172"
-SRCREV_pn-vala-terminal ?= "502d62d7eb100f86380b0e78474cc360ad7944b5"
+SRCREV_pn-vala-terminal ?= "94117f453ce884e9c30b611fae6fc19f85f98f2b"
 SRCREV_pn-webkit-gtk ?= "39964"
 SRCREV_pn-webkit-qt ?= "28656"
 SRCREV_pn-webkit-qtopia ?= "28656"
@@ -231,7 +237,7 @@ SRCREV_pn-wlan-ng-utils ?= "1859"
 SRCREV_pn-wmiconfig ?= "4522"
 SRCREV_pn-xoo ?= "1971"
 SRCREV_pn-xserver-kdrive-glamo ?= "9b28d998424c77fbc057dd3a022ccbb122793a52"
-SRCREV_pn-zhone ?= "cedaa8a6dd70fc3e13bd8bcda7fe84019cf9ef54"
+SRCREV_pn-zhone ?= "f38cc52fbf11f7fe945797a6b8ade29ed479d924"
 
 # Enlightenment Foundation Libraries
 # Caution: This is not alphabetically, but (roughly) dependency-sorted.
diff --git a/conf/machine/collie.conf b/conf/machine/collie.conf
index 92651f60f1..b26df9dfea 100644
--- a/conf/machine/collie.conf
+++ b/conf/machine/collie.conf
@@ -3,18 +3,29 @@
 #@DESCRIPTION: Machine configuration for the SA1100 based Sharp Zaurus SL-5000 and SL-5500 devices
 
 TARGET_ARCH = "arm"
-
-MACHINE_KERNEL_VERSION ?= "2.6"
-require conf/machine/include/zaurus-${MACHINE_KERNEL_VERSION}.inc
 require conf/machine/include/tune-strongarm.inc
 
-PREFERRED_PROVIDER_xserver ?= "xserver-kdrive"
+MACHINE_KERNEL_VERSION = "2.6"
+KERNEL_IMAGE_MAXSIZE = "1048576"
+KERNEL_IMAGETYPE = "zImage"
+SERIAL_CONSOLE = "115200 ttySA0"
+
+ROOT_FLASH_SIZE = "14"
+# actually 14680064, see EXTRA_IMAGECMD
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
+
+XSERVER ?= "xserver-kdrive-fbdev"
 
 EXTRA_IMAGECMD_jffs2 = "--pad=14680064 --little-endian --eraseblock=0x20000 -n"
+
 IMAGE_LINGUAS ?= ""
 IMAGE_FSTYPES ?= "jffs2 tar.gz"
 
-ROOT_FLASH_SIZE = "14"
-# actually 14680064, see EXTRA_IMAGECMD above
+PCMCIA_MANAGER ?= "pcmciautils"
 
-XSERVER ?= "xserver-kdrive-fbdev"
+GUI_MACHINE_CLASS = "smallscreen"
+MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen vfat"
+
+require conf/machine/include/kexecboot.inc
diff --git a/conf/machine/h2200.conf b/conf/machine/h2200.conf
index 6ccdc5070e..abc17728b5 100644
--- a/conf/machine/h2200.conf
+++ b/conf/machine/h2200.conf
@@ -45,5 +45,4 @@ module_autoload_g_ether = "g_ether"
 SERIAL_CONSOLE = "115200 ttyS0 vt100"
 USE_VT = "0"
 
-IMAGE_DEVICE_TABLES = "device_table-oldmmc.txt"
 require conf/machine/include/LAB-settings.inc
diff --git a/conf/machine/hx4700.conf b/conf/machine/hx4700.conf
index 4906f87e76..ab532e33ff 100644
--- a/conf/machine/hx4700.conf
+++ b/conf/machine/hx4700.conf
@@ -73,5 +73,4 @@ module_autoload_pxa27x_udc = "pxa27x_udc"
 #FIXME: this should be controlled by a userspace utility later.
 module_autoload_g_ether = "g_ether"
 
-IMAGE_DEVICE_TABLES = "device_table-oldmmc.txt"
 SERIAL_CONSOLE = "115200 ttyS0"
diff --git a/conf/machine/include/kexecboot.inc b/conf/machine/include/kexecboot.inc
index 0a9f209fe2..c8656bb117 100644
--- a/conf/machine/include/kexecboot.inc
+++ b/conf/machine/include/kexecboot.inc
@@ -13,3 +13,4 @@ RDEPENDS_kernel-base = "kernel-image"
 # we store kernel images in rootfs and only a minimal initramfs kernel in mtd1 for booting other kernels
 DONT_CHECK_KERNELSIZE ?= "1"
 
+MACHINE_EXTRA_RRECOMMENDS_append = " kexecboot-cfg"
diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc
index 8fb36f78be..aeba16b67c 100644
--- a/conf/machine/include/zaurus-2.6.inc
+++ b/conf/machine/include/zaurus-2.6.inc
@@ -2,7 +2,6 @@
 # Additionally, clamshell specific stuff in zaurus-clamshell.inc
 
 TARGET_ARCH = "arm"
-PACKAGE_EXTRA_ARCHS_collie = ""
 
 MACHINE_KERNEL_VERSION = "2.6"
 
@@ -10,14 +9,11 @@ ERASEBLOCKSIZE = "0x4000"
 ERASEBLOCKSIZE_akita = "0x20000"
 
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=${ERASEBLOCKSIZE} --pad --faketime -n" 
-IMAGE_CMD_jffs2 = "mkfs.jffs2 -x lzo --root=${IMAGE_ROOTFS} --output=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.jffs2 ${EXTRA_IMAGECMD}"
 
-ZAURUS-UPDATER_collie = ""
 ZAURUS-UPDATER = "zaurus-updater"
 EXTRA_IMAGEDEPENDS += "${ZAURUS-UPDATER}"
 
 SERIAL_CONSOLE = "115200 ttyS0"
-SERIAL_CONSOLE_collie = "115200 ttySA0"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive"
@@ -35,16 +31,11 @@ MACHINE_EXTRA_RRECOMMENDS_c7x0   = "kernel-module-snd-soc-corgi kernel-module-px
 MACHINE_EXTRA_RRECOMMENDS_akita  = "kernel-module-snd-soc-spitz kernel-module-pxa2xx-cs kernel-module-pcmcia"
 MACHINE_EXTRA_RRECOMMENDS_spitz  = "kernel-module-snd-soc-spitz"
 MACHINE_EXTRA_RRECOMMENDS_poodle = "kernel-module-snd-soc-poodle kernel-module-pxa2xx-cs kernel-module-pcmcia"
-MACHINE_EXTRA_RRECOMMENDS_collie = "kernel-module-locomo-spi kernel-module-sa1100-cs kernel-module-mmc-block \
-	kernel-module-collie-ts kernel-module-leds-locomo kernel-module-locomokbd kernel-module-mmc-spi \
-	kernel-module-power"
 
 GUI_MACHINE_CLASS = "bigscreen"
-GUI_MACHINE_CLASS_collie = "smallscreen"
 GUI_MACHINE_CLASS_poodle = "smallscreen"
 
 KERNEL_IMAGE_MAXSIZE = "1294336"
-KERNEL_IMAGE_MAXSIZE_collie = "1048576"
 
 MACHINE_POSTPROCESS_COMMAND = "zaurus_make_installkit"
 
@@ -69,10 +60,8 @@ zaurus_make_installkit () {
         [ -f ${IMAGE_NAME}.rootfs.jffs2 ] && cp ${IMAGE_NAME}.rootfs.jffs2 ${IMAGE_NAME}-installkit/initrd.bin
     fi
 
-    # All zaurus machines except collie need updater.sh
-    if [ "${MACHINE}" != "collie" ]; then
-        cp updater.sh.${MACHINE} ${IMAGE_NAME}-installkit/updater.sh
-    fi
+    cp updater.sh.${MACHINE} ${IMAGE_NAME}-installkit/updater.sh
+   
  
     tar czf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz ${IMAGE_NAME}-installkit/
     md5sum ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz.md5
diff --git a/conf/machine/overo.conf b/conf/machine/overo.conf
new file mode 100644
index 0000000000..91413ec903
--- /dev/null
+++ b/conf/machine/overo.conf
@@ -0,0 +1,32 @@
+#@TYPE: Machine
+#@NAME: overo machine
+#@DESCRIPTION: Machine configuration for the Gumstix Overo
+
+include conf/machine/include/tune-cortexa8.inc
+
+TARGET_ARCH = "arm"
+MACHINE_FEATURES = "kernel26 screen apm usbgadget usbhost vfat alsa touchscreen"
+
+UBOOT_ENTRYPOINT = "0x80008000"
+UBOOT_LOADADDRESS = "0x80008000"
+UBOOT_MACHINE_overo = "omap3_overo_config"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-omap"
+
+KERNEL_IMAGETYPE = "uImage"
+SERIAL_CONSOLE = "115200 ttyS2"
+
+IMAGE_FSTYPES += "tar.bz2"
+EXTRA_IMAGEDEPENDS += " u-boot-omap3 x-load"
+
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+XSERVER = "xserver-xorg \
+           xf86-input-evdev \
+           xf86-input-mouse \
+           xf86-input-tslib \
+           xf86-video-omapfb \
+           xf86-input-keyboard"
+
+GUI_MACHINE_CLASS = "bigscreen"
+
+
diff --git a/conf/machine/oxe810.conf b/conf/machine/oxnas.conf
index 08213297c8..08213297c8 100644
--- a/conf/machine/oxe810.conf
+++ b/conf/machine/oxnas.conf