hal: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/30-keymap-acer.fdi |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 888ca15ae347ce2dc2a15eebec4396757438410d
Author: Jeremy Katz <katzj at redhat.com>
Date:   Tue Oct 23 11:34:14 2007 +0200

    add Acer TravelMate 2480 keymap
    
    Added Acer TravelMate 2480 keymap.

diff --git a/fdi/information/10freedesktop/30-keymap-acer.fdi b/fdi/information/10freedesktop/30-keymap-acer.fdi
index a41c5c8..ba7a963 100644
--- a/fdi/information/10freedesktop/30-keymap-acer.fdi
+++ b/fdi/information/10freedesktop/30-keymap-acer.fdi
@@ -149,7 +149,7 @@
             <append key="info.capabilities" type="strlist">input.keymap</append>
           </match>
           <!-- Laptops with extra Euro and Dollar keys, and Fn+Right (Brightness Up) needs mapping (type 1) -->
-          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="3260">
+          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="2480;3260">
             <append key="input.keymap.data" type="strlist">e025:help</append> <!-- Fn+F1 Hotkey help -->
             <append key="input.keymap.data" type="strlist">e026:setup</append> <!-- Fn+F2 Acer eSettings -->
             <append key="input.keymap.data" type="strlist">e027:battery</append> <!-- Fn+F3 Power Management -->