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

[Kaleb S. KEITHLEY]

commit f18aa98badf6dc5027d9d8782491471e997cf347
Merge: 85442fe 8965309
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Fri Dec 6 12:33:15 2013 -0500

    Merge remote-tracking branch 'origin' into f18

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