merge of '0a57d791817bb802f8d5d76a1f72267f1b8f3824'

     and '60523827594e8dff880897c63c20ce4b5515bb3e'

14 files changed, 14 insertions, 13 deletions

diff --git a/packages/blueprobe/blueprobe-0.18/h4000.patch b/packages/blueprobe/blueprobe-0.18/h4000.patch
index 35a30c4943..79ea3ebae4 100644
--- a/packages/blueprobe/blueprobe-0.18/h4000.patch
+++ b/packages/blueprobe/blueprobe-0.18/h4000.patch
@@ -4,7 +4,7 @@
          PROTO=bcsp
  	PROBE=yes
  	;;
-+    "HP iPAQ H4000")
++    "HP iPAQ H4100" | "HP iPAQ H4300")
 +	BLUETOOTH=yes
 +	PORT=/dev/ttyS1
 +	SPEED=115200
diff --git a/packages/blueprobe/blueprobe.inc b/packages/blueprobe/blueprobe.inc
index f619f7336c..894a3ebe7e 100644
--- a/packages/blueprobe/blueprobe.inc
+++ b/packages/blueprobe/blueprobe.inc
@@ -1,3 +1,4 @@
 SECTION = "base"
 LICENSE = "GPL"
+DESCRIPTION = "Discovers machine-specific Bluetooth parameters"
 inherit gpe
diff --git a/packages/blueprobe/blueprobe_0.18.bb b/packages/blueprobe/blueprobe_0.18.bb
index 5db1bc4337..08fb6798bf 100644
--- a/packages/blueprobe/blueprobe_0.18.bb
+++ b/packages/blueprobe/blueprobe_0.18.bb
@@ -1,6 +1,6 @@
 require blueprobe.inc
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI += "file://h4000.patch;patch=1 \
             file://uclibc-fix.patch;patch=1"
diff --git a/packages/bluez/bluez-gnome_0.10.bb b/packages/bluez/bluez-gnome_0.10.bb
index d50e8e5fde..398e99d5c1 100644
--- a/packages/bluez/bluez-gnome_0.10.bb
+++ b/packages/bluez/bluez-gnome_0.10.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "BLuetooth configuration applet"
+DESCRIPTION = "Bluetooth configuration applet"
 LICENSE = "GPL+LGPL"
 
 DEPENDS = "dbus-glib gconf libnotify gtk+"
diff --git a/packages/bluez/bluez-gnome_0.13.bb b/packages/bluez/bluez-gnome_0.13.bb
index 0fb8a7980f..e3aaeafeb3 100644
--- a/packages/bluez/bluez-gnome_0.13.bb
+++ b/packages/bluez/bluez-gnome_0.13.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "BLuetooth configuration applet"
+DESCRIPTION = "Bluetooth configuration applet"
 LICENSE = "GPL+LGPL"
 
 PR = "r1"
diff --git a/packages/bluez/bluez-gnome_0.14.bb b/packages/bluez/bluez-gnome_0.14.bb
index 0fb8a7980f..e3aaeafeb3 100644
--- a/packages/bluez/bluez-gnome_0.14.bb
+++ b/packages/bluez/bluez-gnome_0.14.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "BLuetooth configuration applet"
+DESCRIPTION = "Bluetooth configuration applet"
 LICENSE = "GPL+LGPL"
 
 PR = "r1"
diff --git a/packages/bluez/bluez-gnome_cvs.bb b/packages/bluez/bluez-gnome_cvs.bb
index 8900bda6bf..728d20e5f1 100644
--- a/packages/bluez/bluez-gnome_cvs.bb
+++ b/packages/bluez/bluez-gnome_cvs.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "BLuetooth configuration applet"
+DESCRIPTION = "Bluetooth configuration applet"
 LICENSE = "GPL+LGPL"
 
 DEFAULT_PREFERENCE = "-1"
diff --git a/packages/bluez/bluez-gnome_git.bb b/packages/bluez/bluez-gnome_git.bb
index e16fee109d..e8bfd97419 100644
--- a/packages/bluez/bluez-gnome_git.bb
+++ b/packages/bluez/bluez-gnome_git.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "BLuetooth configuration applet"
+DESCRIPTION = "Bluetooth configuration applet"
 LICENSE = "GPL+LGPL"
 
 DEFAULT_PREFERENCE = "-2"
diff --git a/packages/dbus/dbus-glib-native_0.74.bb b/packages/dbus/dbus-glib-native_0.74.bb
index d76cc043d4..e37a64cfea 100644
--- a/packages/dbus/dbus-glib-native_0.74.bb
+++ b/packages/dbus/dbus-glib-native_0.74.bb
@@ -1,7 +1,7 @@
 SECTION = "base"
 PR = "r0"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
-DESCRIPTION = "message bus system for applications to talk to one another"
+DESCRIPTION = "Message bus system for applications to talk to one another"
 LICENSE = "GPL"
 
 SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \
diff --git a/packages/dbus/dbus-glib_0.74.bb b/packages/dbus/dbus-glib_0.74.bb
index 0a34c738c3..3c5512feb6 100644
--- a/packages/dbus/dbus-glib_0.74.bb
+++ b/packages/dbus/dbus-glib_0.74.bb
@@ -1,7 +1,7 @@
 SECTION = "base"
 PR = "r0"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
-DESCRIPTION = "message bus system for applications to talk to one another"
+DESCRIPTION = "Message bus system for applications to talk to one another"
 LICENSE = "GPL"
 DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native dbus"
 
diff --git a/packages/dbus/dbus-native_1.0.1.bb b/packages/dbus/dbus-native_1.0.1.bb
index a897ae5bba..1ad5cf246a 100644
--- a/packages/dbus/dbus-native_1.0.1.bb
+++ b/packages/dbus/dbus-native_1.0.1.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "message bus system for applications to talk to one another"
+DESCRIPTION = "Message bus system for applications to talk to one another"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 LICENSE = "GPL"
 SECTION = "base"
diff --git a/packages/dbus/dbus-python_0.71.bb b/packages/dbus/dbus-python_0.71.bb
index a2d9bd70b3..ed586b7f4b 100644
--- a/packages/dbus/dbus-python_0.71.bb
+++ b/packages/dbus/dbus-python_0.71.bb
@@ -1,4 +1,4 @@
-DESCRIPTION = "message bus system for applications to talk to one another - python bindings"
+DESCRIPTION = "Message bus system for applications to talk to one another - python bindings"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
 LICENSE = "GPL"
 SECTION = "devel/python"
diff --git a/packages/dbus/dbus.inc b/packages/dbus/dbus.inc
index 4f38be304d..21316c2d09 100644
--- a/packages/dbus/dbus.inc
+++ b/packages/dbus/dbus.inc
@@ -1,6 +1,6 @@
 SECTION = "base"
 HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
-DESCRIPTION = "message bus system for applications to talk to one another"
+DESCRIPTION = "Message bus system for applications to talk to one another"
 LICENSE = "GPL"
 DEPENDS = "expat glib-2.0 virtual/libintl"
 
diff --git a/packages/dropbear/dropbear.inc b/packages/dropbear/dropbear.inc
index acd09d89fc..ebe0c1ea9c 100644
--- a/packages/dropbear/dropbear.inc
+++ b/packages/dropbear/dropbear.inc
@@ -1,4 +1,4 @@
-DESCRIPTION = "Dropbear is a lightweight SSH and SCP Implementation"
+DESCRIPTION = "Dropbear is a lightweight SSH and SCP implementation"
 HOMEPAGE = "http://matt.ucc.asn.au/dropbear/dropbear.html"
 SECTION = "console/network"
 LICENSE = "MIT"