[glusterfs/f19: 3/3] Merge remote-tracking branch 'origin' into f19

[Kaleb S. KEITHLEY]

commit 2e848eb164e320998f575467ce96778989061059
Merge: 4f0e486 3999326
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Tue Feb 11 15:21:01 2014 -0500

    Merge remote-tracking branch 'origin' into f19

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