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

[Kaleb S. KEITHLEY]

commit c47ac434d70a2dd85e8908d6f8ca08e9a5ab6d3b
Merge: af9fbde 6158360
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Thu Feb 13 09:55:39 2014 -0500

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

 glusterfs.spec |  385 ++++++++++++++++++--------------------------------------
 sources        |    2 +-
 2 files changed, 126 insertions(+), 261 deletions(-)
---