hal: Branch 'master'

[David Zeuthen]

 fdi/policy/10osvendor/10-macbook-backlight.fdi |    2 +-
 fdi/policy/10osvendor/10-macbookpro-utils.fdi  |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
diff-tree a88fc4ff5e21668d4c41fa5bc7d2188791250b7a (from 8652398da0134f5b4bf42564b6269b0c88dfd187)
Author: David Zeuthen <davidz at redhat.com>
Date:   Mon Jul 9 12:42:15 2007 -0400

    only match on Apple, not "Apple Computer, Inc." for macbook (pro) backlight

diff --git a/fdi/policy/10osvendor/10-macbook-backlight.fdi b/fdi/policy/10osvendor/10-macbook-backlight.fdi
index 0cfbd05..ad2347a 100644
--- a/fdi/policy/10osvendor/10-macbook-backlight.fdi
+++ b/fdi/policy/10osvendor/10-macbook-backlight.fdi
@@ -3,7 +3,7 @@
 <deviceinfo version="0.2">
   <device>
     <match key="system.kernel.name" string="Linux">
-      <match key="smbios.system.manufacturer" string="Apple Computer, Inc.">
+      <match key="smbios.system.manufacturer" string="Apple">
         <match key="smbios.system.product" string="MacBook1,1">
           <spawn udi="/org/freedesktop/Hal/devices/macbook_backlight"/>
         </match>
diff --git a/fdi/policy/10osvendor/10-macbookpro-utils.fdi b/fdi/policy/10osvendor/10-macbookpro-utils.fdi
index f02c614..55b0bdd 100644
--- a/fdi/policy/10osvendor/10-macbookpro-utils.fdi
+++ b/fdi/policy/10osvendor/10-macbookpro-utils.fdi
@@ -5,7 +5,7 @@
   <!-- this is for Macbook Pro (LCD panel, light sensor, keyboard backlight) -->
   <device>
     <match key="system.kernel.name" string="Linux">
-      <match key="system.hardware.vendor" string="Apple Computer, Inc.">
+      <match key="system.hardware.vendor" string="Apple">
         <match key="system.hardware.product" string="MacBookPro1,1">
           <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_light_sensor"/>
           <spawn udi="/org/freedesktop/Hal/devices/macbook_pro_keyboard_backlight"/>