commit 41fe1141f448b07818b1d2578788505157659306 Merge: 2623637 fe82158 Author: Matthias Clasen <mclasen at redhat.com> Date: Thu Aug 5 22:43:13 2010 -0400 Merge branch 'master' of ssh://pkgs.fedoraproject.org/gedit ---