7b4894e add missing commit from master from Ray

Authored and Committed by Lennart Poettering 11 years ago
1 file changed. 75 lines added. 2 lines removed.
    add missing commit from master from Ray
    
        
file modified
+75 -2