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

[Kaleb S. KEITHLEY]

commit 3b604f68372c13abb7d9e7d17bef46774136add3
Merge: fc7f33b 67b178a
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Wed Jun 26 08:38:23 2013 -0400

    Merge remote-tracking branch 'origin/master' into f18
    
    Fix libgfapi, xlator/mount/api dependency between glusterfs and glusterfs-api
    Shorter ChangeLog

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