hal-info: Branch 'master'

[Martin Pitt]

 fdi/information/10freedesktop/30-keymap-acer.fdi |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 16e1c1921e089a4b53940b6b265fc72446d28254
Author: Keng-Yu Lin <keng-yu.lin at canonical.com>
Date:   Wed Sep 16 15:08:05 2009 +0800

    Add hotkey quirk for Acer Aspire One (AO531h/AO751h)
    
    To prevent the brightness adjustment OSD from showing when disabling the bluetooth.
    
    Signed-off-by: Martin Pitt <martin.pitt at ubuntu.com>

diff --git a/fdi/information/10freedesktop/30-keymap-acer.fdi b/fdi/information/10freedesktop/30-keymap-acer.fdi
index a2cf8d8..4511bff 100644
--- a/fdi/information/10freedesktop/30-keymap-acer.fdi
+++ b/fdi/information/10freedesktop/30-keymap-acer.fdi
@@ -61,6 +61,10 @@
           <append key="input.keymap.data" type="strlist">e012:prog2</append> 
           <append key="input.keymap.data" type="strlist">e059:bluetooth</append> <!-- Bluetooth (toggle) on-to-off -->
         </match>
+        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="AO751h;AO531h">
+          <remove key="input.keymap.data" type="strlist">e059:brightnessup</remove>
+          <append key="input.keymap.data" type="strlist">e059:bluetooth</append> <!-- Bluetooth (toggle) on-to-off -->
+        </match>
       </match>
     </match>
   </device>