851c66e Update to upstream git, fix SysV init script

Authored and Committed by slaanesh 11 years ago
    Update to upstream git, fix SysV init script
    
        
file added
+223
file modified
+8 -2
file modified
+7 -3