Merge branch 'org.openembedded.dev' of git@git.openembedded.org:openembedded into...

diff --git a/conf/distro/include/preferred-om-2008-versions.inc b/conf/distro/include/preferred-om-2008-versions.inc
index 7cc923c..d881202 100644 (file)
--- a/conf/distro/include/preferred-om-2008-versions.inc
+++ b/conf/distro/include/preferred-om-2008-versions.inc
@@ -175,7 +175,7 @@ PREFERRED_VERSION_comprec ?= "0.02"
 PREFERRED_VERSION_confuse ?= "2.5"
 PREFERRED_VERSION_confuse-native ?= "2.5"
 PREFERRED_VERSION_connect ?= "0.1"
-PREFERRED_VERSION_connman ?= "0.10"
+PREFERRED_VERSION_connman ?= "0.15"
 PREFERRED_VERSION_conserver ?= "8.1.14"
 PREFERRED_VERSION_console-tools ?= "0.3.2"
 PREFERRED_VERSION_contacts ?= "0.7"
@@ -1963,7 +1963,7 @@ PREFERRED_VERSION_wlan-ng-modules ?= "0.2.7"
 PREFERRED_VERSION_wlan-ng-utils ?= "0.2.7"
 PREFERRED_VERSION_wmctrl ?= "1.07"
 PREFERRED_VERSION_wpa-gui ?= "0.4.8"
-PREFERRED_VERSION_wpa-supplicant ?= "0.6.3"
+PREFERRED_VERSION_wpa-supplicant ?= "0.6.9"
 PREFERRED_VERSION_wpa-supplicant-nossl ?= "0.2.6"
 PREFERRED_VERSION_wpa-supplicant-ssl ?= "0.2.6"
 PREFERRED_VERSION_wrt-imagetools-native ?= "1.0"