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

[Kaleb S. KEITHLEY]

commit 50f0ee1701ebfaec75648acc0d4641b2e19f89d0
Merge: 4062de4 8965309
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Fri Dec 6 12:40:01 2013 -0500

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

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