hal: Branch 'master'

[Danny Kukawka]

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

New commits:
diff-tree 357e0e5485e2deeae1fa241a6827e66b6ac2498d (from 6046509a09d196e0c7a3e2815fc9c73d6258c6c2)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Tue Sep 11 21:32:13 2007 +0200

    added keymapping for Hewlett-Packard nx7300
    
    Added keymapping for Hewlett-Packard nx7300 which is the same as for
    the nx7400.

diff --git a/fdi/information/10freedesktop/30-keymap-hp.fdi b/fdi/information/10freedesktop/30-keymap-hp.fdi
index 2ec865e..dea151e 100644
--- a/fdi/information/10freedesktop/30-keymap-hp.fdi
+++ b/fdi/information/10freedesktop/30-keymap-hp.fdi
@@ -52,7 +52,7 @@
           <append key="input.keymap.data" type="strlist">e059:www</append>	<!-- I key -->
           <append key="info.capabilities" type="strlist">input.keymap</append>
         </match>
-        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains="nx7400">
+        <match key="/org/freedesktop/Hal/devices/computer:system.hardware.product" contains_outof="nx7300;nx7400">
           <append key="input.keymap.data" type="strlist">e001:fn_esc</append>	<!-- FnEsc -->
           <append key="input.keymap.data" type="strlist">e009:battery</append>	<!-- FnF8 (battery) -->
           <append key="input.keymap.data" type="strlist">e00a:screenlock</append>	<!-- FnF6 Lock -->