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

[Kaleb S. KEITHLEY]

commit c3597e36c67de59d3b6b37e09745b33953360390
Merge: bc60b84 3796ec7
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Wed Jul 24 23:53:01 2013 -0400

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

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