propagate from branch 'org.openembedded.dev' (head a09cb27506f56d7b4d048f4d60c7df2e11...

            to branch 'org.openembedded.nslu2-linux' (head 145ec84e58e7acefd29711cc2431b9809b8804e9)

diff --cc packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map
index 5b576ec,dc7fa37..85a194b
mode 100644,100755..100755
--- 1/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map
--- 2/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map
+++ b/packages/initscripts/initscripts-1.0/c7x0/keymap-2.6.map
@@@ -141,71 -143,71 +143,71 @@@ string Prior = "\033[5~
  string Next = "\033[6~"
  string Macro = "\033[M"
  string Pause = "\033[P"
--compose '`' 'A' to 'À'
--compose '`' 'a' to 'à'
--compose '\'' 'A' to 'Á'
--compose '\'' 'a' to 'á'
--compose '^' 'A' to 'Â'
--compose '^' 'a' to 'â'
--compose '~' 'A' to 'Ã'
--compose '~' 'a' to 'ã'
--compose '"' 'A' to 'Ä'
--compose '"' 'a' to 'ä'
--compose 'O' 'A' to 'Å'
--compose 'o' 'a' to 'å'
--compose '0' 'A' to 'Å'
--compose '0' 'a' to 'å'
--compose 'A' 'A' to 'Å'
--compose 'a' 'a' to 'å'
--compose 'A' 'E' to 'Æ'
--compose 'a' 'e' to 'æ'
--compose ',' 'C' to 'Ç'
--compose ',' 'c' to 'ç'
--compose '`' 'E' to 'È'
--compose '`' 'e' to 'è'
--compose '\'' 'E' to 'É'
--compose '\'' 'e' to 'é'
--compose '^' 'E' to 'Ê'
--compose '^' 'e' to 'ê'
--compose '"' 'E' to 'Ë'
--compose '"' 'e' to 'ë'
--compose '`' 'I' to 'Ì'
--compose '`' 'i' to 'ì'
--compose '\'' 'I' to 'Í'
--compose '\'' 'i' to 'í'
--compose '^' 'I' to 'Î'
--compose '^' 'i' to 'î'
--compose '"' 'I' to 'Ï'
--compose '"' 'i' to 'ï'
--compose '-' 'D' to 'Ð'
--compose '-' 'd' to 'ð'
--compose '~' 'N' to 'Ñ'
--compose '~' 'n' to 'ñ'
--compose '`' 'O' to 'Ò'
--compose '`' 'o' to 'ò'
--compose '\'' 'O' to 'Ó'
--compose '\'' 'o' to 'ó'
--compose '^' 'O' to 'Ô'
--compose '^' 'o' to 'ô'
--compose '~' 'O' to 'Õ'
--compose '~' 'o' to 'õ'
--compose '"' 'O' to 'Ö'
--compose '"' 'o' to 'ö'
--compose '/' 'O' to 'Ø'
--compose '/' 'o' to 'ø'
--compose '`' 'U' to 'Ù'
--compose '`' 'u' to 'ù'
--compose '\'' 'U' to 'Ú'
--compose '\'' 'u' to 'ú'
--compose '^' 'U' to 'Û'
--compose '^' 'u' to 'û'
--compose '"' 'U' to 'Ü'
--compose '"' 'u' to 'ü'
--compose '\'' 'Y' to 'Ý'
--compose '\'' 'y' to 'ý'
--compose 'T' 'H' to 'Þ'
--compose 't' 'h' to 'þ'
--compose 's' 's' to 'ß'
--compose '"' 'y' to 'ÿ'
--compose 's' 'z' to 'ß'
--compose 'i' 'j' to 'ÿ'
++compose '`' 'A' to '�
++compose '`' 'a' to '�
++compose '\'' 'A' to '�
++compose '\'' 'a' to '�
++compose '^' 'A' to '�
++compose '^' 'a' to '�
++compose '~' 'A' to '�
++compose '~' 'a' to '�
++compose '"' 'A' to '�
++compose '"' 'a' to '�
++compose 'O' 'A' to '�
++compose 'o' 'a' to '�
++compose '0' 'A' to '�
++compose '0' 'a' to '�
++compose 'A' 'A' to '�
++compose 'a' 'a' to '�
++compose 'A' 'E' to '�
++compose 'a' 'e' to '�
++compose ',' 'C' to '�
++compose ',' 'c' to '�
++compose '`' 'E' to '�
++compose '`' 'e' to '�
++compose '\'' 'E' to '�
++compose '\'' 'e' to '�
++compose '^' 'E' to '�
++compose '^' 'e' to '�
++compose '"' 'E' to '�
++compose '"' 'e' to '�
++compose '`' 'I' to '�
++compose '`' 'i' to '�
++compose '\'' 'I' to '�
++compose '\'' 'i' to '�
++compose '^' 'I' to '�
++compose '^' 'i' to '�
++compose '"' 'I' to '�
++compose '"' 'i' to '�
++compose '-' 'D' to '�
++compose '-' 'd' to '�
++compose '~' 'N' to '�
++compose '~' 'n' to '�
++compose '`' 'O' to '�
++compose '`' 'o' to '�
++compose '\'' 'O' to '�
++compose '\'' 'o' to '�
++compose '^' 'O' to '�
++compose '^' 'o' to '�
++compose '~' 'O' to '�
++compose '~' 'o' to '�
++compose '"' 'O' to '�
++compose '"' 'o' to '�
++compose '/' 'O' to '�
++compose '/' 'o' to ''
++compose '`' 'U' to '�
++compose '`' 'u' to ''
++compose '\'' 'U' to '�
++compose '\'' 'u' to ''
++compose '^' 'U' to '�
++compose '^' 'u' to ''
++compose '"' 'U' to '�
++compose '"' 'u' to ''
++compose '\'' 'Y' to '�
++compose '\'' 'y' to ''
++compose 'T' 'H' to '�
++compose 't' 'h' to ''
++compose 's' 's' to '�
++compose '"' 'y' to ''
++compose 's' 'z' to '�
++compose 'i' 'j' to ''