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

[Kaleb S. KEITHLEY]

commit 848466bb77a94c51ef5a7015b8f41a13467938be
Merge: 2fe9abc 3796ec7
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Wed Jul 24 23:36:26 2013 -0400

    Merge remote-tracking branch 'origin/master' into f19
    
    glusterfs-3.4.0-3

 glusterfs.spec |   59 ++++++++++++++++++++++++++++---------------------------
 1 files changed, 30 insertions(+), 29 deletions(-)
---