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

[Kaleb S. KEITHLEY]

commit 2ba02a5210b28eba8672ec0288f4924a882e4e43
Merge: dc6e014 c426a21
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Tue Jul 16 17:30:28 2013 -0400

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

 glusterfs.spec |  474 ++++++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 344 insertions(+), 130 deletions(-)
---