merge of 827f4059e04553066f724435440d24ddd9d922cb

     and 9b2d4fdceb2f6fd916a463de425a0480831dd0af

25 files changed, 195 insertions, 38 deletions

diff --git a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS b/packages/altboot/files/altboot-menu/Advanced/40-bootNFS
index 88e546a059..cefc46c8d0 100644
--- a/packages/altboot/files/altboot-menu/Advanced/40-bootNFS
+++ b/packages/altboot/files/altboot-menu/Advanced/40-bootNFS
@@ -42,10 +42,10 @@ run_module() {
 	nfs_mounts="`cat /etc/fstab | grep -v ^# | grep nfs | awk '{print $1}'`"
 	nfs_mountpoints="`cat /etc/fstab | grep -v ^# | grep nfs | awk '{print $2}'`"	
 	
-	if test -z "$nfs_hosts"
+	if test -z "$nfs_host"
 	then
-		echo -e "${C_RED}No configured NFS drives found in /etc/fstab$C_RESET"
-		exit 1
+		die "${C_RED}No configured NFS drives found in /etc/fstab$C_RESET"
+		
 	fi
 	
 	# WLAN with DHCP needs some time to get a lease, set up the routing, etc.	
diff --git a/packages/altboot/files/init.altboot b/packages/altboot/files/init.altboot
index 830be08603..b1d0704501 100644
--- a/packages/altboot/files/init.altboot
+++ b/packages/altboot/files/init.altboot
@@ -5,7 +5,6 @@
 # New menu entries can be created be putting files into /etc/altboot-menu.
 #
 
-
 test -e /etc/altboot.func && . /etc/altboot.func || die "ERROR: /etc/altboot.func not found. Check your installation!"
 
 CURRENT_ENV="`set`"
diff --git a/packages/bluez/bluez-utils-dbus_2.20.bb b/packages/bluez/bluez-utils-dbus_2.20.bb
index ca3b110d48..2aad6eae13 100644
--- a/packages/bluez/bluez-utils-dbus_2.20.bb
+++ b/packages/bluez/bluez-utils-dbus_2.20.bb
@@ -1,6 +1,6 @@
 include bluez-utils.inc
 
-PR = "r9"
+PR = "r11"
 
 DEPENDS += "dbus"
 SRC_URI += "file://dbus.patch;patch=1 \
diff --git a/packages/bluez/bluez-utils-dbus_2.21.bb b/packages/bluez/bluez-utils-dbus_2.21.bb
index bfd3994c24..8db7852c84 100644
--- a/packages/bluez/bluez-utils-dbus_2.21.bb
+++ b/packages/bluez/bluez-utils-dbus_2.21.bb
@@ -1,6 +1,6 @@
 include bluez-utils.inc
 
-PR = "r3"
+PR = "r5"
 
 DEPENDS += "dbus"
 SRC_URI += "file://dbus.patch;patch=1 \
diff --git a/packages/bluez/bluez-utils-dbus_2.24.bb b/packages/bluez/bluez-utils-dbus_2.24.bb
index c05208a024..d8c97d91dc 100644
--- a/packages/bluez/bluez-utils-dbus_2.24.bb
+++ b/packages/bluez/bluez-utils-dbus_2.24.bb
@@ -1,6 +1,6 @@
 include bluez-utils.inc
 
-PR = "r0"
+PR = "r2"
 
 DEPENDS += "dbus"
 SRC_URI += "file://dbus.patch;patch=1"
diff --git a/packages/bluez/bluez-utils-nodbus_2.20.bb b/packages/bluez/bluez-utils-nodbus_2.20.bb
index 3c47a030b2..006d1258bc 100644
--- a/packages/bluez/bluez-utils-nodbus_2.20.bb
+++ b/packages/bluez/bluez-utils-nodbus_2.20.bb
@@ -1,6 +1,6 @@
 include bluez-utils.inc
 
-PR = "r1"
+PR = "r3"
 
 SRC_URI += "file://hciattach_devlength.patch;patch=1"
 EXTRA_OECONF += "--without-dbus"
diff --git a/packages/bluez/bluez-utils-nodbus_2.21.bb b/packages/bluez/bluez-utils-nodbus_2.21.bb
index 43c06a9587..49162d55d9 100644
--- a/packages/bluez/bluez-utils-nodbus_2.21.bb
+++ b/packages/bluez/bluez-utils-nodbus_2.21.bb
@@ -1,6 +1,6 @@
 include bluez-utils.inc
 
-PR = "r1"
+PR = "r3"
 
 SRC_URI += "file://hciattach_devlength.patch;patch=1"
 EXTRA_OECONF += "--without-dbus"
diff --git a/packages/bluez/bluez-utils-nodbus_2.24.bb b/packages/bluez/bluez-utils-nodbus_2.24.bb
index 05850a872e..7a9e73216a 100644
--- a/packages/bluez/bluez-utils-nodbus_2.24.bb
+++ b/packages/bluez/bluez-utils-nodbus_2.24.bb
@@ -1,5 +1,5 @@
 include bluez-utils.inc
 
-PR = "r0"
+PR = "r2"
 
 EXTRA_OECONF += "--without-dbus"
diff --git a/packages/bluez/bluez-utils.inc b/packages/bluez/bluez-utils.inc
index 5babed48dc..c68df7bd47 100644
--- a/packages/bluez/bluez-utils.inc
+++ b/packages/bluez/bluez-utils.inc
@@ -10,7 +10,8 @@ SRC_URI = "http://bluez.sourceforge.net/download/bluez-utils-${PV}.tar.gz \
 	file://blueboxes.patch;patch=1 \
 	file://hcid.conf \
 	file://bluetooth.default \
-	file://bluetooth.conf "
+	file://bluetooth.conf \
+	file://02dtl1_cs.sh"
 
 # Almost all serial CF cards w/ manfid 0x0000,0x0000 seem to use the bcs protocol
 # Let's default to that instead of 'any' and see if we break something with that
@@ -32,7 +33,7 @@ do_compile_prepend() {
 }
 
 do_install_append() {
-	install -d ${D}${base_sbindir} ${D}${base_bindir}/
+	install -d ${D}${base_sbindir} ${D}${base_bindir}/ ${D}${sysconfdir}/apm/event.d/
 	mv ${D}${sbindir}/* ${D}${base_sbindir}/
 	mv ${D}${bindir}/* ${D}${base_bindir}/
 	rmdir ${D}${bindir} ${D}${sbindir}
@@ -41,6 +42,7 @@ do_install_append() {
 	install -m 0644 ${WORKDIR}/hcid.conf ${D}${sysconfdir}/bluetooth/
 	install -m 0644 ${WORKDIR}/bluetooth.default ${D}${sysconfdir}/default/bluetooth
 	cat ${WORKDIR}/bluetooth.conf >> ${D}${sysconfdir}/pcmcia/bluetooth.conf
+	install -m 0755 ${WORKDIR}/02dtl1_cs.sh ${D}${sysconfdir}/apm/event.d/
 }
 
 CONFFILES_${PN} = "${sysconfdir}/bluetooth/hcid.conf ${sysconfdir}/bluetooth/rfcomm.conf \
diff --git a/packages/bluez/files/02dtl1_cs.sh b/packages/bluez/files/02dtl1_cs.sh
new file mode 100644
index 0000000000..fefc72e07a
--- /dev/null
+++ b/packages/bluez/files/02dtl1_cs.sh
@@ -0,0 +1,57 @@
+#!/bin/sh
+
+case "$1" in
+	suspend)
+		if [ "`/sbin/hciconfig`" != "" ]; then
+			#If hciconfig outputs anything then there's probably a Bluetooth
+			# CF card in the slot so shut it down.
+			hcitool dc `hcitool con | grep ACL | sed 's/^.*\([0-9A-F]\{2\}\(:[0-9A-F]\{2\}\)\{5\}\).*$/\1/'`
+			hciconfig hci0 down
+			killall hciattach > /dev/null 2>&1 
+		fi 
+		;;
+
+	resume)
+		#check for kernel version
+		if [ "`uname -r | grep 2.4.`" != "" ]; then
+			k="o"
+		elif [ "`uname -r | grep 2.6.`" != "" ]; then
+			k="ko"
+		else
+			exit 0
+		fi
+
+		if test -e /sbin/cardctl; then
+			CARDCTL=/sbin/cardctl
+		elif test -e /sbin/pccardctl; then
+			CARDCTL=/sbin/pccardctl
+		else
+			exit 0
+		fi
+
+		if [ "`lsmod | grep hci_uart`" != "" ]; then
+			#If the hci_usb module is still loaded then there's a serial based
+			# Bluetooth CF card in the slot, which only needs a resume to get it going
+			# again. 
+			rfcomm bind all
+			$CARDCTL resume
+			hciconfig hci0 up
+		else
+			# only works for nokia dtl1 cards
+			for f in /lib/modules/`uname -r`/kernel/drivers/bluetooth/dtl1_cs.$k
+			do
+				#Enumerate all the self-contained Bluetooth CF card drivers
+				f=`echo $f | sed 's/\.'$k'$//'`
+				f=`basename $f`
+				if [ "`lsmod | grep $f`" != "" ]; then
+					#If one of these drivers is still loaded, then there is probably
+					#a non-serial based Bluetooth CF card in the slot that needs
+					#ejecting and reinserting to get it going again
+					rfcomm bind all
+					$CARDCTL eject
+					$CARDCTL insert
+					hciconfig hci0 up
+				fi
+			done
+		fi
+esac
diff --git a/packages/bluez/files/openzaurus/.mtn2git_empty b/packages/bluez/files/openzaurus/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/bluez/files/openzaurus/.mtn2git_empty
diff --git a/packages/bluez/files/openzaurus/bluetooth.default b/packages/bluez/files/openzaurus/bluetooth.default
new file mode 100644
index 0000000000..e63ab137cc
--- /dev/null
+++ b/packages/bluez/files/openzaurus/bluetooth.default
@@ -0,0 +1,37 @@
+# Bluetooth configuraton file
+
+# Start of hcid (allowed values are "true" and "false")
+HCID_ENABLE=true
+
+# Config file for hcid
+HCID_CONFIG="/etc/bluetooth/hcid.conf"
+
+# Start sdpd (allowed values are "true" and "false")
+SDPD_ENABLE=true
+
+# Start hidd (allowed values are "true" and "false")
+HIDD_ENABLE=false
+
+# Arguments to hidd
+HIDD_OPTIONS=""
+
+# Run hid2hci (allowed values are "true" and "false")
+HID2HCI_ENABLE=true
+
+# Bind rfcomm devices (allowed values are "true" and "false")
+RFCOMM_ENABLE=true
+
+# Config file for rfcomm
+RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf"
+
+# Start dund (allowed values are "true" and "false")
+DUND_ENABLE=false
+
+# Arguments to dund
+DUND_OPTIONS="--listen --persist"
+
+# Start pand (allowed values are "true" and "false")
+PAND_ENABLE=false
+
+# Arguments to pand
+PAND_OPTIONS="--listen --role NAP"
diff --git a/packages/initscripts/initscripts-1.0/akita/keymap-2.4.map b/packages/initscripts/initscripts-1.0/akita/keymap-2.4.map
index c47137dda0..1aedc1dc9c 100644
--- a/packages/initscripts/initscripts-1.0/akita/keymap-2.4.map
+++ b/packages/initscripts/initscripts-1.0/akita/keymap-2.4.map
@@ -33,10 +33,10 @@ keycode  31 = BackSpace        BackSpace        Delete           BackSpace
 keycode  32 = Num_Lock         Num_Lock         Num_Lock         Num_Lock         Num_Lock        
 keycode  33 = VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
 keycode  34 = Escape           Escape           Escape           Escape           Escape          
-keycode  35 = Left             Left             Home             Left             Left            
+keycode  35 = Left             Left             Decr_Console             Left             Left            
 keycode  36 = Up               Up               PageUp           Up               Up              
 keycode  37 = Down             Down             PageDown         Down             Down            
-keycode  38 = Right            Right            End              Right            Right           
+keycode  38 = Right            Right            Incr_Console             Right            Right           
 keycode  39 = Return           Return           Return           Return           Return          
 keycode  40 = F12              VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
 keycode  41 = one              exclam           VoidSymbol       VoidSymbol       VoidSymbol 	Console_1      
diff --git a/packages/initscripts/initscripts-1.0/borzoi/keymap-2.4.map b/packages/initscripts/initscripts-1.0/borzoi/keymap-2.4.map
index dc45e948df..1aedc1dc9c 100644
--- a/packages/initscripts/initscripts-1.0/borzoi/keymap-2.4.map
+++ b/packages/initscripts/initscripts-1.0/borzoi/keymap-2.4.map
@@ -1,4 +1,4 @@
-keymaps 0-2,4-5
+keymaps 0-2,4-5,8
 keycode   1 = +a                +A                +a                Control_a        Control_a       
 keycode   2 = +b                +B                underscore       Control_b        Control_b       
 keycode   3 = +c                +C                +c                Control_c        Control_c       
@@ -33,17 +33,17 @@ keycode  31 = BackSpace        BackSpace        Delete           BackSpace
 keycode  32 = Num_Lock         Num_Lock         Num_Lock         Num_Lock         Num_Lock        
 keycode  33 = VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
 keycode  34 = Escape           Escape           Escape           Escape           Escape          
-keycode  35 = Left             Left             Home             Left             Left            
+keycode  35 = Left             Left             Decr_Console             Left             Left            
 keycode  36 = Up               Up               PageUp           Up               Up              
 keycode  37 = Down             Down             PageDown         Down             Down            
-keycode  38 = Right            Right            End              Right            Right           
+keycode  38 = Right            Right            Incr_Console             Right            Right           
 keycode  39 = Return           Return           Return           Return           Return          
 keycode  40 = F12              VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
-keycode  41 = one              exclam           VoidSymbol       VoidSymbol       VoidSymbol      
-keycode  42 = two              quotedbl         VoidSymbol       VoidSymbol       VoidSymbol      
-keycode  43 = three            numbersign       VoidSymbol       VoidSymbol       VoidSymbol      
-keycode  44 = four             dollar           VoidSymbol       VoidSymbol       VoidSymbol      
-keycode  45 = five             percent          VoidSymbol       VoidSymbol       VoidSymbol      
+keycode  41 = one              exclam           VoidSymbol       VoidSymbol       VoidSymbol 	Console_1      
+keycode  42 = two              quotedbl         VoidSymbol       VoidSymbol       VoidSymbol 	Console_2 	
+keycode  43 = three            numbersign       VoidSymbol       VoidSymbol       VoidSymbol 	Console_3 	
+keycode  44 = four             dollar           VoidSymbol       VoidSymbol       VoidSymbol  	Console_4 	
+keycode  45 = five             percent          VoidSymbol       VoidSymbol       VoidSymbol  	Console_5 	
 keycode  46 = six              ampersand        VoidSymbol       VoidSymbol       VoidSymbol      
 keycode  47 = seven            apostrophe       VoidSymbol       VoidSymbol       VoidSymbol      
 keycode  48 = eight            parenleft        VoidSymbol       VoidSymbol       VoidSymbol      
@@ -57,7 +57,7 @@ keycode  55 = at               grave            VoidSymbol       VoidSymbol
 keycode  56 = Control          Control          Control          Control          Control         
 keycode  57 = Alt              Alt              Alt              Alt              Alt             
 keycode  58 = Control          Control          Control          Control          Control         
-keycode  59 = minus            at               VoidSymbol       VoidSymbol       VoidSymbol      
+keycode  59 = minus            VoidSymbol       at	         VoidSymbol       VoidSymbol      
 keycode  60 = Shift_Lock       Shift_Lock       Shift_Lock       Shift_Lock       Shift_Lock      
 keycode  61 = VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
 keycode  62 = VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
@@ -67,7 +67,7 @@ keycode  65 = Tab              Tab              Caps_Lock        Tab
 keycode  66 = VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
 keycode  67 = VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
 keycode  68 = VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
-keycode  69 = asciitilde       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
+keycode  69 = Alt	       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
 keycode  70 = slash            VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
 keycode  71 = KP_1             KP_1             KP_1             KP_1             KP_1            
 keycode  72 = KP_2             KP_2             KP_2             KP_2             KP_2            
diff --git a/packages/initscripts/initscripts-1.0/keymap b/packages/initscripts/initscripts-1.0/keymap
index 792a31d6da..6ebc634266 100755
--- a/packages/initscripts/initscripts-1.0/keymap
+++ b/packages/initscripts/initscripts-1.0/keymap
@@ -6,3 +6,11 @@ KERNEL_MAJMIN=`uname -r | cut -d '.' -f 1,2`
 if [ -e /etc/keymap-$KERNEL_MAJMIN.map ]; then
 	loadkeys /etc/keymap-$KERNEL_MAJMIN.map
 fi
+
+if ( ls "/etc" | grep -q "keymap-extension-${KERNEL_MAJMIN}" )
+then
+	for extension in `ls -1 /etc/keymap-extension-$KERNEL_MAJMIN*` 
+	do	
+		loadkeys "$extension"
+	done
+fi
diff --git a/packages/initscripts/initscripts-1.0/spitz/keymap-2.4.map b/packages/initscripts/initscripts-1.0/spitz/keymap-2.4.map
index dc45e948df..1aedc1dc9c 100644
--- a/packages/initscripts/initscripts-1.0/spitz/keymap-2.4.map
+++ b/packages/initscripts/initscripts-1.0/spitz/keymap-2.4.map
@@ -1,4 +1,4 @@
-keymaps 0-2,4-5
+keymaps 0-2,4-5,8
 keycode   1 = +a                +A                +a                Control_a        Control_a       
 keycode   2 = +b                +B                underscore       Control_b        Control_b       
 keycode   3 = +c                +C                +c                Control_c        Control_c       
@@ -33,17 +33,17 @@ keycode  31 = BackSpace        BackSpace        Delete           BackSpace
 keycode  32 = Num_Lock         Num_Lock         Num_Lock         Num_Lock         Num_Lock        
 keycode  33 = VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
 keycode  34 = Escape           Escape           Escape           Escape           Escape          
-keycode  35 = Left             Left             Home             Left             Left            
+keycode  35 = Left             Left             Decr_Console             Left             Left            
 keycode  36 = Up               Up               PageUp           Up               Up              
 keycode  37 = Down             Down             PageDown         Down             Down            
-keycode  38 = Right            Right            End              Right            Right           
+keycode  38 = Right            Right            Incr_Console             Right            Right           
 keycode  39 = Return           Return           Return           Return           Return          
 keycode  40 = F12              VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
-keycode  41 = one              exclam           VoidSymbol       VoidSymbol       VoidSymbol      
-keycode  42 = two              quotedbl         VoidSymbol       VoidSymbol       VoidSymbol      
-keycode  43 = three            numbersign       VoidSymbol       VoidSymbol       VoidSymbol      
-keycode  44 = four             dollar           VoidSymbol       VoidSymbol       VoidSymbol      
-keycode  45 = five             percent          VoidSymbol       VoidSymbol       VoidSymbol      
+keycode  41 = one              exclam           VoidSymbol       VoidSymbol       VoidSymbol 	Console_1      
+keycode  42 = two              quotedbl         VoidSymbol       VoidSymbol       VoidSymbol 	Console_2 	
+keycode  43 = three            numbersign       VoidSymbol       VoidSymbol       VoidSymbol 	Console_3 	
+keycode  44 = four             dollar           VoidSymbol       VoidSymbol       VoidSymbol  	Console_4 	
+keycode  45 = five             percent          VoidSymbol       VoidSymbol       VoidSymbol  	Console_5 	
 keycode  46 = six              ampersand        VoidSymbol       VoidSymbol       VoidSymbol      
 keycode  47 = seven            apostrophe       VoidSymbol       VoidSymbol       VoidSymbol      
 keycode  48 = eight            parenleft        VoidSymbol       VoidSymbol       VoidSymbol      
@@ -57,7 +57,7 @@ keycode  55 = at               grave            VoidSymbol       VoidSymbol
 keycode  56 = Control          Control          Control          Control          Control         
 keycode  57 = Alt              Alt              Alt              Alt              Alt             
 keycode  58 = Control          Control          Control          Control          Control         
-keycode  59 = minus            at               VoidSymbol       VoidSymbol       VoidSymbol      
+keycode  59 = minus            VoidSymbol       at	         VoidSymbol       VoidSymbol      
 keycode  60 = Shift_Lock       Shift_Lock       Shift_Lock       Shift_Lock       Shift_Lock      
 keycode  61 = VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
 keycode  62 = VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
@@ -67,7 +67,7 @@ keycode  65 = Tab              Tab              Caps_Lock        Tab
 keycode  66 = VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
 keycode  67 = VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
 keycode  68 = VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
-keycode  69 = asciitilde       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
+keycode  69 = Alt	       VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
 keycode  70 = slash            VoidSymbol       VoidSymbol       VoidSymbol       VoidSymbol      
 keycode  71 = KP_1             KP_1             KP_1             KP_1             KP_1            
 keycode  72 = KP_2             KP_2             KP_2             KP_2             KP_2            
diff --git a/packages/initscripts/initscripts_1.0.bb b/packages/initscripts/initscripts_1.0.bb
index 4bdd918a59..18017d1e90 100644
--- a/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@ -6,7 +6,7 @@ DEPENDS = "makedevs"
 DEPENDS_openzaurus = "makedevs virtual/kernel"
 RDEPENDS = "makedevs"
 LICENSE = "GPL"
-PR = "r60"
+PR = "r63"
 
 SRC_URI = "file://halt \
            file://ramdisk \
diff --git a/packages/keymap-locales/.mtn2git_empty b/packages/keymap-locales/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/keymap-locales/.mtn2git_empty
diff --git a/packages/keymap-locales/files/.mtn2git_empty b/packages/keymap-locales/files/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/keymap-locales/files/.mtn2git_empty
diff --git a/packages/keymap-locales/files/akita/.mtn2git_empty b/packages/keymap-locales/files/akita/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/keymap-locales/files/akita/.mtn2git_empty
diff --git a/packages/initscripts/initscripts-1.0/akita/keymap-extension-2.4-de.map b/packages/keymap-locales/files/akita/keymap-extension-2.4-de.map
index 0a43c8d107..0a43c8d107 100644
--- a/packages/initscripts/initscripts-1.0/akita/keymap-extension-2.4-de.map
+++ b/packages/keymap-locales/files/akita/keymap-extension-2.4-de.map
diff --git a/packages/keymap-locales/files/placeholder.map b/packages/keymap-locales/files/placeholder.map
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/keymap-locales/files/placeholder.map
diff --git a/packages/keymap-locales/keymap-locales.bb b/packages/keymap-locales/keymap-locales.bb
new file mode 100644
index 0000000000..89cb5aa580
--- /dev/null
+++ b/packages/keymap-locales/keymap-locales.bb
@@ -0,0 +1,22 @@
+DESCRIPTION = "Localized key mappings"
+SECTION = "base"
+PRIORITY = "optional"
+MAINTAINER = "Matthias 'CoreDump' Hentges  <oe@hentges.net>"
+LICENSE = "GPL"
+
+PR = "r1"
+
+SRC_URI = "file://*.map"
+
+# If any python guru wants to setup PACKAGES_$machine with some code instead,
+# be my guet =)
+PACKAGES_akita = "keymap-extension-de"
+
+FILES_keymap-extension-de = "/etc/*-de.map"
+FILES_keymap-extension-fr = "/etc/*-fr.map"
+
+do_install() {
+	install -d ${D}/${sysconfdir}
+	
+	install -m 0644 ${WORKDIR}/*.map ${D}/${sysconfdir}
+}
diff --git a/packages/opie-ttf-support/files/update-qtttffontdir.c b/packages/opie-ttf-support/files/update-qtttffontdir.c
index 4c2b0c6eff..fa45e38a8b 100644
--- a/packages/opie-ttf-support/files/update-qtttffontdir.c
+++ b/packages/opie-ttf-support/files/update-qtttffontdir.c
@@ -46,6 +46,8 @@ int main(int argc, char* argv[])
 	chdir(argv[1]);
 	if((katalog = opendir(".")))
 	{
+		int found_fixed = 0;
+
 		while((plik = readdir(katalog)))
 		{
 			if(!strstr(plik->d_name, ".ttf"))
@@ -62,7 +64,38 @@ int main(int argc, char* argv[])
 				char* ptr;
 
 				for(ptr = strchr(face->family_name,' '); (ptr = strchr(ptr, ' ')); ) *ptr = '_';
-				
+
+				if(
+						face->face_flags & FT_FACE_FLAG_FIXED_WIDTH &&
+						!found_fixed &&
+						!(face->style_flags & FT_STYLE_FLAG_ITALIC) &&
+						!(face->style_flags & FT_STYLE_FLAG_BOLD)
+					)
+				{
+					found_fixed = 1;
+					printf("fixed %s/%s FT", argv[1], plik->d_name);
+
+					if(face->style_flags & FT_STYLE_FLAG_ITALIC)
+					{
+						printf(" y");
+					}
+					else
+					{
+						printf(" n");
+					}
+
+					if(face->style_flags & FT_STYLE_FLAG_BOLD)
+					{
+						printf(" 75");
+					}
+					else
+					{
+						printf(" 50");
+					}
+
+					printf(" 60 su \n");
+				}
+
 				printf("%s %s/%s FT", face->family_name, argv[1], plik->d_name);
 
 				if(face->style_flags & FT_STYLE_FLAG_ITALIC)
@@ -82,7 +115,7 @@ int main(int argc, char* argv[])
 				{
 					printf(" 50");
 				}
-				
+
 				printf(" 60 su \n");
 
 				FT_Done_Face(face);
diff --git a/packages/opie-ttf-support/opie-ttf-support_1.0.0.bb b/packages/opie-ttf-support/opie-ttf-support_1.1.bb
index fa20f212b7..f012af4a72 100644
--- a/packages/opie-ttf-support/opie-ttf-support_1.0.0.bb
+++ b/packages/opie-ttf-support/opie-ttf-support_1.1.bb
@@ -1,7 +1,6 @@
 DESCRIPTION = "Meta-package for Opie TTF support"
 DEPENDS = "freetype"
 SECTION = "opie/fonts"
-PR = "r5"
 
 SRC_URI = "file://update-qtttffontdir.c"
 S = "${WORKDIR}"