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

[Kaleb S. KEITHLEY]

commit 2e083809d5ac4d23e12b8eeb10d8b0aa3e09038d
Merge: 673f9fa 8965309
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Fri Dec 6 12:30:03 2013 -0500

    Merge remote-tracking branch 'origin' into f19

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