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

[Kaleb S. KEITHLEY]

commit 25e34b23fc9d9a2c5396865171813cfe3dbf0810
Merge: bd3c6ba 2ad0eed
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Fri Jun 28 12:50:19 2013 -0400

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

 glusterfs.spec |   18 ++++++++++++------
 sources        |    4 ++--
 2 files changed, 14 insertions(+), 8 deletions(-)
---