[glusterfs/kk-el6: 12/12] Merge branch 'kk-el5' into kk-el6

[Kaleb S. KEITHLEY]

commit c6876af26e421936f56e34636ae11cdb5a69dc19
Merge: 338559d b690634
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Thu Jan 16 17:19:26 2014 -0500

    Merge branch 'kk-el5' into kk-el6

 glusterfs.spec |   42 ++++++++++++++++--------------------------
 1 files changed, 16 insertions(+), 26 deletions(-)
---