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

[Kaleb S. KEITHLEY]

commit 0f177b84c957fb65945156db8fbb8bf01523bc41
Merge: 80aa0a1 15cab6a
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Wed Mar 26 15:31:46 2014 -0400

    Merge remote-tracking branch 'origin/master' into kk-el6

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