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

[Kaleb S. KEITHLEY]

commit 83428a568f87992b24378c56ceac0b324f2c84c8
Merge: 79eadc2 2ad0eed
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Fri Jun 28 12:34:47 2013 -0400

    Merge remote-tracking branch 'origin/master' into f17
    
    glusterfs-3.4.0-0.8.beta4

 glusterfs.spec   |   50 +++++++++++++++++++++++++++++---------------------
 sources          |    4 ++--
 umount.glusterfs |    4 ----
 3 files changed, 31 insertions(+), 27 deletions(-)
---