Merge branch 'master' into imlib2

Conflicts:
	configure.ac.in
	src/conky.c

diff --cc configure.ac.in
index b6002cb,c2c911b..f614c5e
--- 1/configure.ac.in
--- 2/configure.ac.in
+++ b/configure.ac.in
@@@ -731,5 -751,5 +750,6 @@@ $PACKAGE $VERSION configured successful
    nvidia:           $want_nvidia
    eve-online:       $want_eve
    config-output:    $want_config_output
 +  IMLIB2:           $want_imlib2
+   ALSA mixer:       $want_alsa
  EOF

diff --cc src/conky.c
index b4efb63,128494e..abf6c71
--- 1/src/conky.c
--- 2/src/conky.c
+++ b/src/conky.c
@@@ -210,9 -210,9 +210,12 @@@ static void print_version(void
  #ifdef CONFIG_OUTPUT
                   "  * config-output\n"
  #endif /* CONFIG_OUTPUT */
 +#ifdef IMLIB2
 +                 "  * IMLIB2\n"
 +#endif /* IMLIB2 */
+ #ifdef MIXER_IS_ALSA
+                  "  * ALSA mixer support\n"
+ #endif /* MIXER_IS_ALSA */
        );
  
        exit(0);

diff --cc src/x11.c
Simple merge