3b604f6 Merge remote-tracking branch 'origin/master' into f18

Merged and Committed by kkeithle 10 years ago
    Merge remote-tracking branch 'origin/master' into f18
    
    Fix libgfapi, xlator/mount/api dependency between glusterfs and glusterfs-api
    Shorter ChangeLog
    
        
file modified
+9 -3