10 files changed, 41 insertions, 10 deletions
diff --git a/packages/angstrom/task-angstrom-x11.bb b/packages/angstrom/task-angstrom-x11.bb
index 13bc3efc4f..e72691f345 100644
--- a/packages/angstrom/task-angstrom-x11.bb
+++ b/packages/angstrom/task-angstrom-x11.bb
@@ -1,5 +1,5 @@
 DESCRIPTION = "Task packages for the Angstrom distribution"
-PR = "r23"
+PR = "r24"
 ALLOW_EMPTY = "1"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -24,6 +24,7 @@ RDEPENDS_angstrom-x11-base-depends := "\
 
 RDEPENDS_angstrom-gpe-task-base := "\
     matchbox \
+    matchbox-panel-hacks \
     xcursor-transparent-theme \
     rxvt-unicode \
     gpe-terminal \
@@ -89,7 +90,8 @@ RDEPENDS_angstrom-gpe-task-games := "\
     gpe-othello \
     gpe-tetris \
     gsoko \
-    xdemineur"
+#    xdemineur \
+"
 
 RDEPENDS_angstrom-task-office := "\
     gnumeric \
diff --git a/packages/bluez/bluez-gnome_0.6.bb b/packages/bluez/bluez-gnome_0.6.bb
new file mode 100644
index 0000000000..481a383019
--- /dev/null
+++ b/packages/bluez/bluez-gnome_0.6.bb
@@ -0,0 +1,10 @@
+DESCRIPTION = "BLuetooth configuration applet"
+LICENSE = "GPL+LGPL"
+
+DEPENDS = "bluez-libs dbus-glib gconf libnotify gtk+ openobex"
+
+SRC_URI = "http://bluez.sourceforge.net/download/${P}.tar.gz"
+
+inherit autotools pkgconfig
+
+
diff --git a/packages/gcc/gcc-cross-sdk_4.1.1.bb b/packages/gcc/gcc-cross-sdk_4.1.1.bb
index 7233f79504..e3050d3926 100644
--- a/packages/gcc/gcc-cross-sdk_4.1.1.bb
+++ b/packages/gcc/gcc-cross-sdk_4.1.1.bb
@@ -2,7 +2,6 @@ DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
 LICENSE = "GPL"
-require gcc_${PV}.bb
 PR = "r0"
 
 inherit sdk
@@ -12,5 +11,6 @@ FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc"
 PACKAGES = "${PN}"
 
+require gcc_${PV}.bb
 require gcc4-build-sdk.inc
 require gcc-package-sdk.inc
diff --git a/packages/gpe-themes/gpe-theme-foxbox_0.1.bb b/packages/gpe-themes/gpe-theme-foxbox_0.1.bb
index 5e2bd90ce1..c2b829ab74 100644
--- a/packages/gpe-themes/gpe-theme-foxbox_0.1.bb
+++ b/packages/gpe-themes/gpe-theme-foxbox_0.1.bb
@@ -10,4 +10,4 @@ S = 			"${WORKDIR}/foxbox"
 
 FILES_${PN} = 	"${datadir}/themes"
 
-SRC_URI = 		"http://dominion.kabel.utwente.nl/~florian/themes/foxbox-${PV}.tar.gz"
+SRC_URI = 		"http://linuxtogo.org/~florian/themes/foxbox-${PV}.tar.gz"
diff --git a/packages/linux/ixp4xx-kernel_2.6.19-rc6.bb b/packages/linux/ixp4xx-kernel_2.6.19-rc6.bb
index 83d77472ab..7620aedb0c 100644
--- a/packages/linux/ixp4xx-kernel_2.6.19-rc6.bb
+++ b/packages/linux/ixp4xx-kernel_2.6.19-rc6.bb
@@ -6,7 +6,7 @@
 # http://trac.nslu2-linux.org/kernel/
 #
 # The revision that is pulled from SVN is specified below
-IXP4XX_KERNEL_SVN_REV = "589"
+IXP4XX_KERNEL_SVN_REV = "591"
 #
 # The directory containing the patches to be applied is
 # specified below
diff --git a/packages/linux/linux-handhelds-2.6_2.6.18-hh1.bb b/packages/linux/linux-handhelds-2.6_2.6.18-hh1.bb
new file mode 100644
index 0000000000..b34d4630a0
--- /dev/null
+++ b/packages/linux/linux-handhelds-2.6_2.6.18-hh1.bb
@@ -0,0 +1,11 @@
+SECTION = "kernel"
+DESCRIPTION = "handhelds.org Linux kernel 2.6 for PocketPCs and other consumer handheld devices."
+LICENSE = "GPL"
+PR = "r0"
+
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26;tag=${@'K' + bb.data.getVar('PV',d,1).replace('.', '-')} \
+           file://defconfig"
+
+require linux-handhelds-2.6.inc
diff --git a/packages/linux/linux-handhelds-2.6_cvs.bb b/packages/linux/linux-handhelds-2.6_cvs.bb
index e921643a53..1c1d8f38fe 100644
--- a/packages/linux/linux-handhelds-2.6_cvs.bb
+++ b/packages/linux/linux-handhelds-2.6_cvs.bb
@@ -7,7 +7,7 @@ PR = "r5"
 K_MAJOR = "2"
 K_MINOR = "6"
 K_MICRO = "18"
-HHV     = "0"
+HHV     = "1"
 
 SRC_URI = "${HANDHELDS_CVS};module=linux/kernel26  \
            file://defconfig"
diff --git a/packages/slugos-init/files/initscripts/umountinitrd.sh b/packages/slugos-init/files/initscripts/umountinitrd.sh
index 9cb1f7a25d..2798fe5985 100644
--- a/packages/slugos-init/files/initscripts/umountinitrd.sh
+++ b/packages/slugos-init/files/initscripts/umountinitrd.sh
@@ -5,20 +5,27 @@
 # then the /initrd is mounted and we want to remount that
 # ro - this works round the shutdown -r hang problem
 . /etc/default/functions
+
+case "$(machine)" in
+nslu2)
+	ffspart="Flashdisk";;
+*)
+	ffspart="filesystem";;
+esac
+
 while read device directory remainder
 do
 	case "$directory" in
 	/mnt)	echo "InitRD: unmount initrd on /mnt" >&2
 		umount /mnt;;
 	/initrd)# need the device for a remount
-		ffspart=Flashdisk
 		ffsdev="$(mtblockdev $ffspart)"
-		echo "InitRD: remount $ffdev read-only on /initrd" >&2
+		echo "Remounting $ffsdev read-only on /initrd" >&2
 		if test -n "$ffsdev" -a -b "$ffsdev"
 		then
 			mount -o remount,ro "$ffsdev" /initrd
 		else
-			echo "Flashdisk: $ffsdev: flash device not found" >&2
+			echo "$ffspart: $ffsdev: flash device not found" >&2
 		fi;;
 	esac
 done </proc/mounts
diff --git a/packages/slugos-init/files/modulefunctions b/packages/slugos-init/files/modulefunctions
index d7c2b9777c..1073dae4fb 100644
--- a/packages/slugos-init/files/modulefunctions
+++ b/packages/slugos-init/files/modulefunctions
@@ -13,6 +13,7 @@ loaddiskmods(){
 	        modprobe ohci-hcd
 		;;
             nas100d)
+                modprobe pata-artop
                 modprobe ehci-hcd
                 modprobe uhci-hcd
                 ;;
diff --git a/packages/slugos-init/slugos-init_0.10.bb b/packages/slugos-init/slugos-init_0.10.bb
index de3b6151c1..54c1993c67 100644
--- a/packages/slugos-init/slugos-init_0.10.bb
+++ b/packages/slugos-init/slugos-init_0.10.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
 LICENSE = "GPL"
 DEPENDS = "base-files devio"
 RDEPENDS = "busybox devio"
-PR = "r73"
+PR = "r74"
 
 SRC_URI = "file://boot/flash \
 	   file://boot/disk \