Merge branch 'ss/git-gui-mergetool'
authorPat Thoyts <patthoyts@users.sourceforge.net>
Fri, 25 Mar 2011 08:26:47 +0000 (08:26 +0000)
committerPat Thoyts <patthoyts@users.sourceforge.net>
Fri, 25 Mar 2011 08:26:47 +0000 (08:26 +0000)
Trivial merge