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

diff --cc ChangeLog
index 6790909,a87fc90..c4deada
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,8 +1,9 @@@
+ 2008-12-15
+       * Have a maximum width for all variable length mpd vars
+ 
  2008-12-14
        * Fix disk_protect for linux-2.6.27 (and hopefully above)
 +      * Improve behaviour of $pb_battery
  
  2008-12-09
        * Add an option to timed_thread_test() to not wait for the interval period

diff --cc src/linux.c
Simple merge