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

[Kaleb S. KEITHLEY]

commit fcc9a44537f4f8be2190c5c240a94bacc0160a26
Merge: 142a1ba 579af0d
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Fri Jul 12 14:26:49 2013 -0400

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

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