[glusterfs/el6: 2/2] Merge remote-tracking branch 'origin/f18' into el6

[Kaleb S. KEITHLEY]

commit 94b4b8d3a184cabb4f5e202532066ef86b77e655
Merge: 11fd630 dc6e014
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Tue Jul 16 14:26:45 2013 -0400

    Merge remote-tracking branch 'origin/f18' into el6
    
    3.3.2-2, tag /var/lib/glusterd/glusterd.info as %config

 glusterfs.spec |   24 +++++++++++++++++-------
 1 files changed, 17 insertions(+), 7 deletions(-)
---