[glusterfs/el5: 3/4] Merge remote-tracking branch 'origin/master' into el5

[Kaleb S. KEITHLEY]

commit da94711bf46ff59b93dc0fcdab07c54adc74bea7
Merge: bddd6dd 06b0ae2
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Tue Oct 1 12:18:59 2013 -0400

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

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