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

[Kaleb S. KEITHLEY]

commit 304c7398ef8d99f4e0a9fe9c04029dd49bcb714b
Merge: 3f046da 64c6ffc
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Mon Aug 5 19:20:12 2013 -0400

    Merge remote-tracking branch 'origin/master' into el5
    
    glusterfs-3.4.0-7, glusterfs requires glusterfs-libs

 glusterfs.spec |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---