Merge branch 'master' of ssh://rootserver/home/lennart/git/public/pulseaudio

diff --cc src/Makefile.am
index bde51eb234fdc6debdc003147088a532fa9b5427,608e67864f25e4e0af8c53d3d881bcd735e20d97..dd9035b5ce859324adabe656b8c354fd3b8c7c7a
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -1140,13 -1176,9 +1178,13 @@@ module_sine_la_LDFLAGS = $(MODULE_LDFLA
  module_sine_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la
  
  module_null_sink_la_SOURCES = modules/module-null-sink.c
- module_null_sink_la_LDFLAGS = -module -avoid-version
+ module_null_sink_la_LDFLAGS = $(MODULE_LDFLAGS)
  module_null_sink_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la
  
 +module_sine_source_la_SOURCES = modules/module-sine-source.c
 +module_sine_source_la_LDFLAGS = -module -avoid-version
 +module_sine_source_la_LIBADD = $(AM_LIBADD) libpulsecore-@PA_MAJORMINORMICRO@.la libpulsecommon-@PA_MAJORMINORMICRO@.la libpulse.la
 +
  # Couplings
  
  module_combine_la_SOURCES = modules/module-combine.c

diff --cc src/modules/module-alsa-sink.c
Simple merge

diff --cc src/modules/module-alsa-source.c
Simple merge