[glusterfs/kk-el6: 3/3] Merge remote-tracking branch 'origin' into kk-el6

[Kaleb S. KEITHLEY]

commit af9fbde466f820a6001b1d58fd00246ce5df5f2a
Merge: 8a0d584 3999326
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Tue Feb 11 15:38:10 2014 -0500

    Merge remote-tracking branch 'origin' into kk-el6

 glusterfs.spec |   32 ++++++++++++++++++++++++++++++--
 sources        |    2 +-
 2 files changed, 31 insertions(+), 3 deletions(-)
---