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

[Kaleb S. KEITHLEY]

commit 31edce20b2408488cf1869934d96a5c7a38b282a
Merge: de55132 1d0cf40
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Sat Mar 8 14:25:30 2014 -0500

    Merge remote-tracking branch 'origin' into f19

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