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

[Kaleb S. KEITHLEY]

commit 80aa0a171825d57f22bbb3bd0bc9c3025c628253
Merge: 153d979 726e6ff
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Thu Mar 13 13:02:14 2014 -0400

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

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