hal: Branch 'master'

[Danny Kukawka]

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

New commits:
commit 70fb8a2f56f93f3bc5ab5633ac9dddf5deb34362
Author: Jeremy Katz <katzj at redhat.com>
Date:   Tue Oct 23 11:31:51 2007 +0200

    Ferarri 1000 has the same keyboard as the 4000
    
    Added keymap for Acer Ferarri 1000, which has the same keyboard as the 4000.

diff --git a/fdi/information/10freedesktop/30-keymap-acer.fdi b/fdi/information/10freedesktop/30-keymap-acer.fdi
index fb202a9..a41c5c8 100644
--- a/fdi/information/10freedesktop/30-keymap-acer.fdi
+++ b/fdi/information/10freedesktop/30-keymap-acer.fdi
@@ -103,7 +103,7 @@
         </match>
         <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" prefix="Ferrari">
           <!-- Laptops with extra Euro and Dollar keys -->
-          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="4000">
+          <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="1000;4000">
             <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 -->