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

[Kaleb S. KEITHLEY]

commit 7dfcd03e883e55c7f25a4963d8fee63f4e339a11
Merge: 3edacb9 8c76f93
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Tue Dec 17 12:06:25 2013 -0500

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

 glusterfs.spec |  348 +++++++++++++++++---------------------------------------
 sources        |    2 +-
 2 files changed, 106 insertions(+), 244 deletions(-)
---