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

[Kaleb S. KEITHLEY]

commit bc382b65f5d573c39737972ab3dcef8ae7df83b9
Merge: 31edce2 726e6ff
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Thu Mar 13 12:12:32 2014 -0400

    Merge remote-tracking branch 'origin' into f19

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