commit 18a789609e064fee862663b28b41c199294bf7f6 Merge: 69edf27 67486f6 Author: Jonathan Steffan <jsteffan at fedoraproject.org> Date: Sat Jan 1 17:47:07 2011 -0700 Merge branch 'master' of ssh://pkgs.fedoraproject.org/glusterfs ---