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

[Kaleb S. KEITHLEY]

commit 79eadc27036c699d26fe1957d3dab75b71d63531
Merge: db8b8c9 67b178a
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Wed Jun 26 08:54:11 2013 -0400

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

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