commit 6ae2b0624048f11fb46134db34c5d810fe32b96b Merge: 14e450c afc762c Author: Kaleb S. KEITHLEY <kkeithle at redhat.com> Date: Mon Oct 28 06:55:30 2013 -0400 Merge branch 'kk-el6' of ssh://pkgs.fedoraproject.org/glusterfs into kk-el6 Conflicts: glusterfs.spec ---