Merge branch 'master' into Gtk.

diff --cc dist/shared.sh
index a7ea1776a3715da77e648bb6be274ad329517740,e3f73488eb839627e3518275e899473bb0289674..59041f7876582345b59ebcf17d3481293be3264b
--- 1/dist/shared.sh
--- 2/dist/shared.sh
+++ b/dist/shared.sh
@@@ -100,7 -100,7 +100,7 @@@ LIARC_OUT=${OUTPUT_DIR}/liar
  NATIVE_OUT=${OUTPUT_DIR}/native
  MACOSX_OUT=${OUTPUT_DIR}/macosx
  
- PLUGINS="blowfish gdbm mcrypt md5 mhash gtk gl"
 -PLUGINS="blowfish gdbm mcrypt md5 mhash x11 x11-screen"
++PLUGINS="blowfish gdbm mcrypt md5 mhash x11 x11-screen gtk gl"
  
  notify ()
  {