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

[Kaleb S. KEITHLEY]

commit 003250bcd240007d522c96cad17e2e5dbf596f86
Merge: 236b17d 7cd60ea
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Wed Sep 11 08:29:00 2013 -0400

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

 glusterfs.spec |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
---