propagate from branch 'org.openembedded.dev' (head d4815037189353e6445b917ec6b4bd64777c3c0d)

            to branch 'org.openembedded.dev.avr32' (head ba98da9ed913fe826c336573fe5912b1168f3e28)

93 files changed, 4141 insertions, 503 deletions

diff --git a/packages/abiword/abiword-2.5.inc b/packages/abiword/abiword-2.5.inc
index 42fc6c7d6e..09f61d0534 100644
--- a/packages/abiword/abiword-2.5.inc
+++ b/packages/abiword/abiword-2.5.inc
@@ -13,10 +13,10 @@ SHRT_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,
 
 FILES_${PN} += " \
 		${datadir}/icons/* \
-		${datadir}/abiword-${SHRT_VER}/AbiWord/glade \
-		${datadir}/abiword-${SHRT_VER}/AbiWord/scripts \
-		${datadir}/abiword-${SHRT_VER}/AbiWord/system.profile-en \
-		${datadir}/abiword-${SHRT_VER}/AbiWord/system.profile-en_GB \
+		${datadir}/abiword-${SHRT_VER}/glade \
+		${datadir}/abiword-${SHRT_VER}/scripts \
+		${datadir}/abiword-${SHRT_VER}/system.profile-en \
+		${datadir}/abiword-${SHRT_VER}/system.profile-en_GB \
 #		${datadir}/abiword-${SHRT_VER}/templates/A4.awt \
 #		${datadir}/abiword-${SHRT_VER}/templates/US-Letter.awt \
 		${datadir}/abiword-${SHRT_VER}/templates/normal.awt \
diff --git a/packages/abiword/abiword_2.5.1.bb b/packages/abiword/abiword_2.5.1.bb
index 5fcc1dd1a2..9741ad6413 100644
--- a/packages/abiword/abiword_2.5.1.bb
+++ b/packages/abiword/abiword_2.5.1.bb
@@ -2,6 +2,6 @@ require abiword-2.5.inc
 
 DEFAULT_PREFERENCE = "-1"
 
-PR = "r1"
+PR = "r2"
 
 RCONFLICTS = "abiword-embedded"
diff --git a/packages/abiword/abiword_2.5.2.bb b/packages/abiword/abiword_2.5.2.bb
index 66d8fae0ad..5fcc1dd1a2 100644
--- a/packages/abiword/abiword_2.5.2.bb
+++ b/packages/abiword/abiword_2.5.2.bb
@@ -2,6 +2,6 @@ require abiword-2.5.inc
 
 DEFAULT_PREFERENCE = "-1"
 
-PR = "r0"
+PR = "r1"
 
 RCONFLICTS = "abiword-embedded"
diff --git a/packages/alsa/alsa-state.bb b/packages/alsa/alsa-state.bb
index e2a92dcfc8..1bac841a6e 100644
--- a/packages/alsa/alsa-state.bb
+++ b/packages/alsa/alsa-state.bb
@@ -8,7 +8,7 @@ DESCRIPTION = "Default ALSA configuration"
 LICENSE = "GPL"
 RRECOMMENDS_alsa-state = "alsa-states"
 PV = "0.1.0"
-PR = "r1"
+PR = "r3"
 
 SRC_URI = " \
   file://asoundrc \
diff --git a/packages/alsa/alsa-state/a780/.mtn2git_empty b/packages/alsa/alsa-state/a780/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/alsa/alsa-state/a780/.mtn2git_empty
diff --git a/packages/alsa/alsa-state/a780/asound.state b/packages/alsa/alsa-state/a780/asound.state
new file mode 100644
index 0000000000..eafd409857
--- /dev/null
+++ b/packages/alsa/alsa-state/a780/asound.state
@@ -0,0 +1,80 @@
+state.EZX {
+	control.1 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 1
+		comment.range '0 - 15'
+		iface MIXER
+		name 'Output gain'
+		value 9
+	}
+	control.2 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 1
+		comment.range '0 - 31'
+		iface MIXER
+		name 'Input gain'
+		value 14
+	}
+	control.3 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 1
+		iface MIXER
+		name 'Input Mixer A3 Switch'
+		value true
+	}
+	control.4 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 1
+		iface MIXER
+		name 'Input Mixer A5 Switch'
+		value true
+	}
+	control.5 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 1
+		iface MIXER
+		name 'Output Mixer A1 Switch'
+		value true
+	}
+	control.6 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 1
+		iface MIXER
+		name 'Output Mixer A2 Switch'
+		value true
+	}
+	control.7 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 1
+		iface MIXER
+		name 'Output Mixer AR Switch'
+		value true
+	}
+	control.8 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 1
+		iface MIXER
+		name 'Output Mixer AL Switch'
+		value true
+	}
+	control.9 {
+		comment.access 'read write'
+		comment.type ENUMERATED
+		comment.count 1
+		comment.item.0 '2ch'
+		comment.item.1 '2->1ch'
+		comment.item.2 '2->1ch -3db'
+		comment.item.3 '2->1ch -6db'
+		iface MIXER
+		name Downmixer
+		value '2ch'
+	}
+}
diff --git a/packages/alsa/alsa-state/hx4700/.mtn2git_empty b/packages/alsa/alsa-state/hx4700/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/alsa/alsa-state/hx4700/.mtn2git_empty
diff --git a/packages/alsa/alsa-state/hx4700/asound.state b/packages/alsa/alsa-state/hx4700/asound.state
new file mode 100644
index 0000000000..98661f5e3a
--- /dev/null
+++ b/packages/alsa/alsa-state/hx4700/asound.state
@@ -0,0 +1,37 @@
+state.'hx4700 Audio' {
+	control.1 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 2
+		comment.range '0 - 255'
+		iface MIXER
+		name 'Master Playback Volume'
+		value.0 205
+		value.1 205
+	}
+	control.2 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 1
+		iface MIXER
+		name 'Master Playback Switch'
+		value true
+	}
+	control.3 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 1
+		comment.range '0 - 127'
+		iface MIXER
+		name 'Mic Capture Gain'
+		value 16
+	}
+	control.4 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 1
+		iface MIXER
+		name 'Mic Boost (+20dB)'
+		value true
+	}
+}
diff --git a/packages/alsa/alsa-state/magician/.mtn2git_empty b/packages/alsa/alsa-state/magician/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/alsa/alsa-state/magician/.mtn2git_empty
diff --git a/packages/alsa/alsa-state/magician/asound.state b/packages/alsa/alsa-state/magician/asound.state
new file mode 100644
index 0000000000..edc85dd364
--- /dev/null
+++ b/packages/alsa/alsa-state/magician/asound.state
@@ -0,0 +1,202 @@
+state.Magician {
+	control.1 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 2
+		comment.range '0 - 255'
+		iface MIXER
+		name 'Playback Volume'
+		value.0 205
+		value.1 205
+	}
+	control.2 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 2
+		comment.range '0 - 255'
+		iface MIXER
+		name 'Mixer Volume'
+		value.0 255
+		value.1 0
+	}
+	control.3 {
+		comment.access 'read write'
+		comment.type ENUMERATED
+		comment.count 1
+		comment.item.0 Flat
+		comment.item.1 Minimum1
+		comment.item.2 Minimum2
+		comment.item.3 Maximum
+		iface MIXER
+		name 'Sound Processing Filter Mode'
+		value Flat
+	}
+	control.4 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 2
+		comment.range '0 - 3'
+		iface MIXER
+		name 'Treble Volume'
+		value.0 0
+		value.1 0
+	}
+	control.5 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 2
+		comment.range '0 - 15'
+		iface MIXER
+		name 'Bass Volume'
+		value.0 0
+		value.1 0
+	}
+	control.6 {
+		comment.access 'read write'
+		comment.type ENUMERATED
+		comment.count 2
+		comment.item.0 None
+		comment.item.1 '32kHz'
+		comment.item.2 '44.1kHz'
+		comment.item.3 '48kHz'
+		comment.item.4 '96kHz'
+		iface MIXER
+		name 'Playback De-emphasis'
+		value.0 None
+		value.1 None
+	}
+	control.7 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 2
+		comment.range '0 - 127'
+		iface MIXER
+		name 'Capture Volume'
+		value.0 0
+		value.1 0
+	}
+	control.8 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 2
+		comment.range '0 - 15'
+		iface MIXER
+		name 'Line Capture Volume'
+		value.0 0
+		value.1 0
+	}
+	control.9 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 1
+		comment.range '0 - 11'
+		iface MIXER
+		name 'Mic Capture Volume'
+		value 0
+	}
+	control.10 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 2
+		iface MIXER
+		name 'Playback Switch'
+		value.0 true
+		value.1 false
+	}
+	control.11 {
+		comment.access 'read write'
+		comment.type BOOLEAN
+		comment.count 1
+		iface MIXER
+		name 'Capture Switch'
+		value true
+	}
+	control.12 {
+		comment.access 'read write'
+		comment.type INTEGER
+		comment.count 1
+		comment.range '0 -