83c7658 Fix merge issue for hal, thum, usernetctl

Authored and Committed by mgrepl 12 years ago
    Fix merge issue for hal, thum, usernetctl
    
        
file modified
+19 -0
file modified
+1 -1
file modified
+0 -1