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

[Kaleb S. KEITHLEY]

commit f256b058e798d9b4c24ffeda732f4d6638cdd24a
Merge: 70e23e9 a42cd3b
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Mon Jul 8 08:19:26 2013 -0400

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

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