[glusterfs/f19: 2/2] Merge remote-tracking branch 'origin/master' into f19

[Kaleb S. KEITHLEY]

commit 773f3b74c54f362d4a7b4987bb5656efe6a39181
Merge: d6e8e0e 67b178a
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Wed Jun 26 08:02:26 2013 -0400

    Merge remote-tracking branch 'origin/master' into f19
    
    Fix libgfapi, xlator/mount/api dependency
    Shortened ChangeLog

 glusterfs.spec |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)
---