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

[Kaleb S. KEITHLEY]

commit 72f6bae7154a1b639d38538bdd4506299f3cd5c8
Merge: f18aa98 8c76f93
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Tue Dec 17 11:54:41 2013 -0500

    Merge remote-tracking branch 'origin' into f18

 glusterfs.spec |  348 +++++++++++++++++---------------------------------------
 sources        |    2 +-
 2 files changed, 106 insertions(+), 244 deletions(-)
---