hal: Branch 'master'

[Danny Kukawka]

 hald/create_cache.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9f8a3c8b867d7008e2674c1f09d343d67c1dd636
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Mon Aug 11 16:00:55 2008 +0200

    fixed merge for uint64
    
    Fixed typo to get merge working again with type=uint64.
    
    Should fix fd.o bug #16575.

diff --git a/hald/create_cache.c b/hald/create_cache.c
index cdc8c9a..d52f834 100644
--- a/hald/create_cache.c
+++ b/hald/create_cache.c
@@ -159,7 +159,7 @@ get_merge_type (const char *str)
 		return MERGE_BOOLEAN;
 	if (strcmp (str, "int") == 0)
 		return MERGE_INT32;
-	if (strcmp (str, "unint64") == 0)
+	if (strcmp (str, "uint64") == 0)
 		return MERGE_UINT64;
 	if (strcmp (str, "double") == 0)
 		return MERGE_DOUBLE;