Merge branch 'master' of git://0pointer.de/pulseaudio into dbus-work

Conflicts:
	src/Makefile.am

diff --cc src/Makefile.am
index c3ca1eb10926b2a38828f468d5d67e9ee736d532,e65662c70b3b4d995d1eefdeb4695e85d50c6f90..16834ee99c401a9f5101d7e609e08744d2bddb2b
--- 1/src/Makefile.am
--- 2/src/Makefile.am
+++ b/src/Makefile.am
@@@ -1253,7 -1250,7 +1254,8 @@@ SYMDEF_FILES = 
                modules/module-augment-properties-symdef.h \
                modules/module-cork-music-on-phone-symdef.h \
                modules/module-console-kit-symdef.h \
-               modules/dbus/module-dbus-protocol-symdef.h
++              modules/dbus/module-dbus-protocol-symdef.h \
+               modules/module-loopback-symdef.h
  
  EXTRA_DIST += $(SYMDEF_FILES)
  BUILT_SOURCES += $(SYMDEF_FILES)