Merge branch 'master' of git.omp.am:/home/omp/git/conky into lua

Conflicts:
	src/specials.c

diff --cc src/conky.c
Simple merge

diff --cc src/specials.c
index dc78968,3d57f3c..a299cf7
--- 1/src/specials.c
--- 2/src/specials.c
+++ b/src/specials.c
@@@ -45,7 -45,10 +45,8 @@@ unsigned int special_count
  #ifdef X11
  int default_bar_width = 0, default_bar_height = 6;
  int default_graph_width = 0, default_graph_height = 25;
 -int default_gauge_width = 50, default_gauge_height = 25;
 -#else
 -int default_bar_width = 10, default_bar_height = 1;
 +int default_gauge_width = 40, default_gauge_height = 25;
+ #endif
  
  /*
   * Scanning arguments to various special text objects

diff --cc src/text_object.h
Simple merge