d8b5a4d Merge remote-tracking branch 'origin/master' into f17

Authored and Committed by kkeithle 11 years ago
    Merge remote-tracking branch 'origin/master' into f17
    glusterfs-3.3.0-3
    
        
file modified
+8 -1