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

[Kaleb S. KEITHLEY]

commit 66baed8207a892a01ff2d3f9310d60101486aa2a
Merge: d1ae84e e0f9420
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Thu Apr 3 11:52:16 2014 -0400

    Merge remote-tracking branch 'origin' into f19

 glusterfs.spec |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)
---