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

[Kaleb S. KEITHLEY]

commit 7b1213c27806dc608cdb6e1d820e0deeccf77543
Merge: 3d00296 3796ec7
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Thu Jul 25 00:04:53 2013 -0400

    Merge remote-tracking branch 'origin/master' into el6
    
    glusterfs-3.4.0-3, sync with gluster glusterfs.spec.in and esp.
    with glusterd.service w/o Wants=glusterfsd.service

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