hal-info: Branch 'master' - 2 commits

[Danny Kukawka]

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

New commits:
commit 537053ad8a1dd323a38311427052b6c750f861e2
Merge: c6e6ff3... ed38314...
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Mon Jan 19 16:12:27 2009 +0100

    Merge branch 'master' of ssh://dkukawka@git.freedesktop.org/git/hal-info

commit c6e6ff3ec1d6e7ea2e47635e338836ec452979a3
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Mon Jan 19 16:06:17 2009 +0100

    add keymapping for a Samsung Q310
    
    Added keymapping for a Samsung Q310 as reported by Milo
    <legalmilo at gmail.com> via the HAL ML.

diff --git a/fdi/information/10freedesktop/30-keymap-misc.fdi b/fdi/information/10freedesktop/30-keymap-misc.fdi
index d46fb0d..de2193c 100644
--- a/fdi/information/10freedesktop/30-keymap-misc.fdi
+++ b/fdi/information/10freedesktop/30-keymap-misc.fdi
@@ -100,7 +100,7 @@
       </match>
 
       <match key="/org/freedesktop/Hal/devices/computer:system.hardware.vendor" prefix_ncase="samsung">
-	<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="NC10;SP55S;SQ45S70S;SX60P;R59P/R60P/R61P">
+	<match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="NC10;SP55S;SQ45S70S;SX60P;R59P/R60P/R61P;Q310">
           <append key="input.keymap.data" type="strlist">e002:displaytoggle</append> <!-- Fn+F4 CRT/LCD -->
           <append key="input.keymap.data" type="strlist">e003:battery</append> <!-- Fn+F2 battery icon -->
           <append key="input.keymap.data" type="strlist">e004:prog1</append> <!-- Fn+F5 backlight on/off -->