ddc858 - Update to upstream

Authored and Committed by dwalsh 10 years ago
    - Update to upstream
    - Fixes for devicekit_disk
    
        
file modified
+3 -3
file modified
+5 -1