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

[Kaleb S. KEITHLEY]

commit f7a79e4e6585e2a538666ebda5a3779a60143cfe
Merge: 0880d75 d38e826
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Fri Jan 3 07:29:00 2014 -0500

    Merge remote-tracking branch 'origin' into f18

 glusterfs.spec |    7 +++++--
 sources        |    2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)
---