merge of '1ba445dfd1a9b934962a4db388d6ab641b3f74e8'

     and '8f2da0702f522e178a88e3c2dd8f65e05d0680a7'

8 files changed, 8 insertions, 8 deletions

diff --git a/packages/bluez/bluez-utils3.inc b/packages/bluez/bluez-utils3.inc
index 3932d722ee..e9edfe1b95 100644
--- a/packages/bluez/bluez-utils3.inc
+++ b/packages/bluez/bluez-utils3.inc
@@ -40,7 +40,7 @@ EXTRA_OECONF = " \
 # The config options are explained below:
 
 #  --enable-obex           enable OBEX support
-#  --enable-alsa           enable ALSA support, not needed for nokia770, nokia800 and fic-gtao1
+#  --enable-alsa           enable ALSA support, not needed for nokia770, nokia800 and om-gtao1
 #  --enable-cups           install CUPS backend support
 #  --enable-bccmd          install BCCMD interface utility
 #  --enable-avctrl         install Audio/Video control utility
diff --git a/packages/bluez/bluez-utils_3.11.bb b/packages/bluez/bluez-utils_3.11.bb
index 6cadfc1a53..25fda9dcff 100644
--- a/packages/bluez/bluez-utils_3.11.bb
+++ b/packages/bluez/bluez-utils_3.11.bb
@@ -29,7 +29,7 @@ EXTRA_OECONF = " \
 # The config options are explained below:
 
 #  --enable-obex           enable OBEX support
-#  --enable-alsa           enable ALSA support, not needed for nokia770, nokia800 and fic-gtao1
+#  --enable-alsa           enable ALSA support, not needed for nokia770, nokia800 and om-gtao1
 #  --enable-cups           install CUPS backend support
 #  --enable-bccmd          install BCCMD interface utility
 #  --enable-avctrl         install Audio/Video control utility
diff --git a/packages/bluez/bluez-utils_3.12.bb b/packages/bluez/bluez-utils_3.12.bb
index 754097acce..98a79af901 100644
--- a/packages/bluez/bluez-utils_3.12.bb
+++ b/packages/bluez/bluez-utils_3.12.bb
@@ -27,7 +27,7 @@ EXTRA_OECONF = " \
 # The config options are explained below:
 
 #  --enable-obex           enable OBEX support
-#  --enable-alsa           enable ALSA support, not needed for nokia770, nokia800 and fic-gtao1
+#  --enable-alsa           enable ALSA support, not needed for nokia770, nokia800 and om-gtao1
 #  --enable-cups           install CUPS backend support
 #  --enable-bccmd          install BCCMD interface utility
 #  --enable-avctrl         install Audio/Video control utility
diff --git a/packages/bluez/bluez-utils_3.13.bb b/packages/bluez/bluez-utils_3.13.bb
index 5ea1429641..0a2a062338 100644
--- a/packages/bluez/bluez-utils_3.13.bb
+++ b/packages/bluez/bluez-utils_3.13.bb
@@ -27,7 +27,7 @@ EXTRA_OECONF = " \
 # The config options are explained below:
 
 #  --enable-obex           enable OBEX support
-#  --enable-alsa           enable ALSA support, not needed for nokia770, nokia800 and fic-gtao1
+#  --enable-alsa           enable ALSA support, not needed for nokia770, nokia800 and om-gtao1
 #  --enable-cups           install CUPS backend support
 #  --enable-bccmd          install BCCMD interface utility
 #  --enable-avctrl         install Audio/Video control utility
diff --git a/packages/bluez/bluez-utils_3.14.bb b/packages/bluez/bluez-utils_3.14.bb
index 237a1aff0d..5d0c3cf15b 100644
--- a/packages/bluez/bluez-utils_3.14.bb
+++ b/packages/bluez/bluez-utils_3.14.bb
@@ -28,7 +28,7 @@ EXTRA_OECONF = " \
 # The config options are explained below:
 
 #  --enable-obex           enable OBEX support
-#  --enable-alsa           enable ALSA support, not needed for nokia770, nokia800 and fic-gtao1
+#  --enable-alsa           enable ALSA support, not needed for nokia770, nokia800 and om-gtao1
 #  --enable-cups           install CUPS backend support
 #  --enable-bccmd          install BCCMD interface utility
 #  --enable-avctrl         install Audio/Video control utility
diff --git a/packages/bluez/bluez-utils_3.15.bb b/packages/bluez/bluez-utils_3.15.bb
index b8dbfbca7c..a7d1dce192 100644
--- a/packages/bluez/bluez-utils_3.15.bb
+++ b/packages/bluez/bluez-utils_3.15.bb
@@ -29,7 +29,7 @@ EXTRA_OECONF = " \
 # The config options are explained below:
 
 #  --enable-obex           enable OBEX support
-#  --enable-alsa           enable ALSA support, not needed for nokia770, nokia800 and fic-gtao1
+#  --enable-alsa           enable ALSA support, not needed for nokia770, nokia800 and om-gtao1
 #  --enable-cups           install CUPS backend support
 #  --enable-bccmd          install BCCMD interface utility
 #  --enable-avctrl         install Audio/Video control utility
diff --git a/packages/bluez/bluez-utils_3.16.bb b/packages/bluez/bluez-utils_3.16.bb
index b8dbfbca7c..a7d1dce192 100644
--- a/packages/bluez/bluez-utils_3.16.bb
+++ b/packages/bluez/bluez-utils_3.16.bb
@@ -29,7 +29,7 @@ EXTRA_OECONF = " \
 # The config options are explained below:
 
 #  --enable-obex           enable OBEX support
-#  --enable-alsa           enable ALSA support, not needed for nokia770, nokia800 and fic-gtao1
+#  --enable-alsa           enable ALSA support, not needed for nokia770, nokia800 and om-gtao1
 #  --enable-cups           install CUPS backend support
 #  --enable-bccmd          install BCCMD interface utility
 #  --enable-avctrl         install Audio/Video control utility
diff --git a/packages/bluez/bluez-utils_3.17.bb b/packages/bluez/bluez-utils_3.17.bb
index b8dbfbca7c..a7d1dce192 100644
--- a/packages/bluez/bluez-utils_3.17.bb
+++ b/packages/bluez/bluez-utils_3.17.bb
@@ -29,7 +29,7 @@ EXTRA_OECONF = " \
 # The config options are explained below:
 
 #  --enable-obex           enable OBEX support
-#  --enable-alsa           enable ALSA support, not needed for nokia770, nokia800 and fic-gtao1
+#  --enable-alsa           enable ALSA support, not needed for nokia770, nokia800 and om-gtao1
 #  --enable-cups           install CUPS backend support
 #  --enable-bccmd          install BCCMD interface utility
 #  --enable-avctrl         install Audio/Video control utility