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

[Kaleb S. KEITHLEY]

commit 3edacb99fb8d59af2cd1a28ca079d8d80a9d5600
Merge: 8408597 8965309
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Fri Dec 6 12:36:51 2013 -0500

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

 glusterfs.spec |  172 ++++++++++++++++++++++++++++++++++++++++++++++----------
 sources        |    2 +-
 2 files changed, 143 insertions(+), 31 deletions(-)
---