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

[Kaleb S. KEITHLEY]

commit 7904a464a87390ea36a384397cb8689da5158735
Merge: 5c14db3 40fe609
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Fri Apr 4 14:25:57 2014 -0400

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

 glusterfs.spec |  398 +++++++++++++++++++++++++++++++++++++-------------------
 sources        |    2 +-
 2 files changed, 265 insertions(+), 135 deletions(-)
---