[glusterfs/el6: 6/6] Merge remote-tracking branch 'origin/master' into el6 glusterfs-3.4.0-0.9.beta4

[Kaleb S. KEITHLEY]

commit f2fb34e3e92a6b8d3088f6d8b2d0992c8a641737
Merge: fd01220 a42cd3b
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Mon Jul 8 08:47:09 2013 -0400

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

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