Merge branch 'master' of git://nwl.cc/~n0-1/conky

diff --cc ChangeLog
index 5a5955a,297b821..3c5149c
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,8 +1,9 @@@
+ 2008-12-17
+       * Make gateway objects also detect routes with missing RTF_GATEWAY flag
+ 
  2008-12-15
        * Have a maximum width for all variable length mpd vars
 +      * Patch to allow escaping newlines in the config (thanks Itai)
  
  2008-12-14
        * Fix disk_protect for linux-2.6.27 (and hopefully above)

diff --cc src/linux.c
Simple merge