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

[Kaleb S. KEITHLEY]

commit 2fe9abc28c328ffd17315468647fbdd7a5a053f2
Merge: fcc9a44 c426a21
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Tue Jul 16 15:35:39 2013 -0400

    Merge remote-tracking branch 'origin/master' into f19
    
    glusterfs-3.4.0-2, tag /var/lib/glusterd/glusterd.info as %config

 glusterfs.spec |   28 +++++++++++++++++++++-------
 1 files changed, 21 insertions(+), 7 deletions(-)
---