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

[Kaleb S. KEITHLEY]

commit 85442fe37de693e04b337c1c774b267c4678939c
Merge: f4adbd9 43f3a1f
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Wed Nov 6 14:14:08 2013 -0500

    Merge remote-tracking branch 'origin/master' into f18

 glusterfs.spec |  188 ++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 109 insertions(+), 79 deletions(-)
---