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

[Kaleb S. KEITHLEY]

commit 498718658f8f1ced0f0ec4d355a09ab30b582802
Merge: ec7aaab e27233f
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Fri May 24 08:36:05 2013 -0400

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

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