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

[Kaleb S. KEITHLEY]

commit 153d979fa3710344a8a2b3bd4923eb18139a7285
Merge: c47ac43 1d0cf40
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Sat Mar 8 14:43:01 2014 -0500

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

 glusterfs.spec |  386 ++++++++++++++++++++++++++++++++++++++------------------
 sources        |    2 +-
 2 files changed, 263 insertions(+), 125 deletions(-)
---