Merge git://repo.or.cz/git-gui

* git://repo.or.cz/git-gui:
  git-gui: Fix the search bar destruction handler.
  Update the po template
  git-gui: Implement automatic rescan after Tool execution.
  git-gui: Allow Tools request arguments from the user.
  git-gui: Add a Tools menu for arbitrary commands.
  git-gui: Fix the after callback execution in rescan.
  git-gui: Implement system-wide configuration handling.
  git-gui: try to provide a window icon under X

diff --cc git-gui/git-gui.sh
Simple merge

diff --cc git-gui/lib/diff.tcl
Simple merge

diff --cc git-gui/lib/option.tcl
Simple merge

diff --cc git-gui/lib/search.tcl
Simple merge

diff --cc git-gui/lib/tools.tcl
index 0000000000000000000000000000000000000000,6ae63b6c7c61cb8f773ba5b9367c948820a0873a..6ae63b6c7c61cb8f773ba5b9367c948820a0873a
mode 000000,100644..100644
--- /dev/null
--- 2/lib/tools.tcl
+++ b/git-gui/lib/tools.tcl

diff --cc git-gui/lib/tools_dlg.tcl
index 0000000000000000000000000000000000000000,5f7f08e239038e47da7bb0383fd840276d9caf59..5f7f08e239038e47da7bb0383fd840276d9caf59
mode 000000,100644..100644
--- /dev/null
--- 2/lib/tools_dlg.tcl
+++ b/git-gui/lib/tools_dlg.tcl

diff --cc git-gui/po/git-gui.pot
Simple merge