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

[Kaleb S. KEITHLEY]

commit 053f6331486594b9ffdc72e719e8b3d794687590
Merge: f256b05 579af0d
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Fri Jul 12 14:37:03 2013 -0400

    Merge remote-tracking branch 'origin/master' into f18
    
    GlusterFS 3.4.0 GA, glusterfs-3.4.0-1

 glusterfs.spec |   13 ++++++-------
 sources        |    4 ++--
 2 files changed, 8 insertions(+), 9 deletions(-)
---