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

[Kaleb S. KEITHLEY]

commit 9fb2ef8f992100693ea8fc5aeab7ecabc31222ac
Merge: 8cc71c5 89a44d0
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Mon Aug 5 13:34:25 2013 -0400

    Merge remote-tracking branch 'origin/master' into el6
    
    3.4.0-6, glusterfs-cli for simplified vdsm dependencies

 glusterfs.spec |   33 ++++++++++++++++++++++++++-------
 1 files changed, 26 insertions(+), 7 deletions(-)
---