hal: Branch 'master'

[David Zeuthen]

 fdi/policy/10osvendor/10-power-mgmt-policy.fdi |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree 7602464b92f9617b34ea5606426061fe3077820e (from d17ef57074fa9585456dc62da9aef983df84af60)
Author: David Zeuthen <davidz at redhat.com>
Date:   Mon Dec 4 20:50:13 2006 -0500

    fix setting power_management.is_powersave_set
    
    Without this fix, the property is not properly initialized.

diff --git a/fdi/policy/10osvendor/10-power-mgmt-policy.fdi b/fdi/policy/10osvendor/10-power-mgmt-policy.fdi
index cd16cee..e0607fd 100644
--- a/fdi/policy/10osvendor/10-power-mgmt-policy.fdi
+++ b/fdi/policy/10osvendor/10-power-mgmt-policy.fdi
@@ -52,7 +52,7 @@
       <append key="org.freedesktop.Hal.Device.SystemPowerManagement.method_execpaths" type="strlist">hal-system-power-set-power-save</append>
 
       <!-- Consider that we're not saving power at startup -->
-      <append key="power_management.is_powersave_set" type="boolean">false</append>
+      <merge key="power_management.is_powersave_set" type="bool">false</merge>
     </match>
   </device>