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

[Kaleb S. KEITHLEY]

commit cb4da210d8a283b37e6a944dbab40d610adf4a8b
Merge: 72d6e61 a42cd3b
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Mon Jul 8 08:33:27 2013 -0400

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

 glusterfs.spec |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)
---