Merge branch 'master' into imlib2

Conflicts:
	src/Makefile.am

diff --cc configure.ac.in
index ed04376,2deabd9..7336040
--- 1/configure.ac.in
--- 2/configure.ac.in
+++ b/configure.ac.in
@@@ -765,6 -786,6 +785,7 @@@ $PACKAGE $VERSION configured successful
    nvidia:           $want_nvidia
    eve-online:       $want_eve
    config-output:    $want_config_output
 +  IMLIB2:           $want_imlib2
    ALSA mixer:       $want_alsa
+   apcupsd:          $want_apcupsd
  EOF

diff --cc src/Makefile.am
index 6410c0a,61f202d..380a724
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -111,10 -111,10 +111,14 @@@ if BUILD_NVIDI
  nvidia = nvidia.c nvidia.h
  endif
  
 +if BUILD_IMLIB2
 +imlib2 = imlib2.c imlib2.h
 +endif
 +
+ if BUILD_APCUPSD
+ apcupsd = apcupsd.c apcupsd.h
+ endif
+ 
  conky_SOURCES = \
        $(config_output)        \
        $(config_cookie)        \

diff --cc src/conky.c
index beab469,1ff323f..edbe90b
--- 1/src/conky.c
--- 2/src/conky.c
+++ b/src/conky.c
@@@ -7257,20 -7488,7 +7477,12 @@@ static void load_config_file(const cha
                                stippled_borders = 4;
                        }
                }
 +              CONF("imlib_cache_size") {
 +                      if (value) {
 +                              cimlib_set_cache_size(atoi(value));
 +                      }
 +              }
  #endif /* X11 */
-               CONF("temp1") {
-                       ERR("temp1 configuration is obsolete, use ${i2c <i2c device here> "
-                               "temp 1}");
-               }
-               CONF("temp2") {
-                       ERR("temp2 configuration is obsolete, use ${i2c <i2c device here> "
-                               "temp 2}");
-               }
                CONF("update_interval") {
                        if (value) {
                                update_interval = strtod(value, 0);