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

[Kaleb S. KEITHLEY]

commit fc7f33b116943098e75d570ae8193ccd235bef8c
Merge: 02dfdb1 d57cbf3
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Tue Jun 11 14:16:18 2013 -0400

    Merge remote-tracking branch 'origin/master' into f18

 glusterfs.spec          |   60 +++++++++++++++++++++++++++++++++-------------
 rhel5-load-fuse-modules |    7 +++++
 sources                 |    4 +-
 3 files changed, 52 insertions(+), 19 deletions(-)
---