merge of 256698cb5e6bbc32343fd2d7b714517efc0e3d0c

     and 27b9c5adc9f3c8d43d5702469feb4aef564a14c4

122 files changed, 2015 insertions, 396 deletions

diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index 71dc101f0f..6afd6ca2cd 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -298,7 +298,7 @@ export palmqtdir = "/opt/QtPalmtop"
 GNU_MIRROR = "ftp://ftp.gnu.org/gnu"
 DEBIAN_MIRROR = "ftp://ftp.debian.org/debian/pool"
 SOURCEFORGE_MIRROR = "http://heanet.dl.sourceforge.net/sourceforge"
-GPE_MIRROR = "http://ftp.handhelds.org/pub/projects/gpe/source"
+GPE_MIRROR = "http://handhelds.org/pub/projects/gpe/source"
 XLIBS_MIRROR = "http://xlibs.freedesktop.org/release"
 XORG_MIRROR = "http://xorg.freedesktop.org/releases"
 GNOME_MIRROR = "http://ftp.gnome.org/pub/GNOME/sources"
@@ -306,6 +306,7 @@ FREEBSD_MIRROR = "ftp://ftp.freebsd.org/pub/FreeBSD/"
 HANDHELDS_CVS = "cvs://anoncvs:anoncvs@anoncvs.handhelds.org/cvs"
 FREEDESKTOP_CVS = "cvs://anoncvs:anoncvs@anoncvs.freedesktop.org/cvs"
 GENTOO_MIRROR = "http://distro.ibiblio.org/pub/linux/distributions/gentoo/distfiles"
+APACHE_MIRROR = "http://www.apache.org/dist"
 
 # You can use the mirror of your country to get faster downloads by putting
 #  export DEBIAN_MIRROR = "ftp://ftp.de.debian.org/debian/pool"
diff --git a/conf/distro/angstrom-2006.9.conf b/conf/distro/angstrom-2006.9.conf
index ccaee57d6d..be0f5e93fe 100644
--- a/conf/distro/angstrom-2006.9.conf
+++ b/conf/distro/angstrom-2006.9.conf
@@ -52,13 +52,13 @@ PREFERRED_VERSION_gcc-cross-initial ?= "4.0.2"
 
 
 #use EABI toolchain
-#PREFERRED_VERSION_gcc ?= "3.4.4+csl-arm-20051214"
-#PREFERRED_VERSION_gcc-cross ?= "3.4.4+csl-arm-20051214"
-#PREFERRED_VERSION_gcc-cross-initial ?= "3.4.4+csl-arm-20051214"
-#PREFERRED_VERSION_binutils ?= "2.16.9