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

Conflicts:
	src/Makefile.am
	src/daemon/daemon-conf.c
	src/daemon/daemon.conf.in
	src/modules/module-stream-restore.c
	src/pulse/client-conf.c
	src/pulsecore/namereg.c

po/POTFILES.in

@@ -55,7 +55,6 @@ src/pulsecore/queue.c
 src/pulsecore/core.c
 #src/pulsecore/shmasyncq.c
 src/pulsecore/x11wrap.c
-src/pulsecore/rtclock.c
 src/pulsecore/ioline.c
 src/pulsecore/asyncq.c
 src/pulsecore/mutex-posix.c
@@ -99,7 +98,6 @@ src/pulsecore/strlist.c
 src/pulsecore/msgobject.c
 src/pulsecore/mutex-win32.c
 src/pulsecore/dynarray.c
-src/pulsecore/rtsig.c
 src/pulsecore/once.c
 src/pulsecore/source.c
 src/pulsecore/memchunk.c
@@ -149,14 +147,12 @@ src/pulsecore/protocol-http.c
 src/pulsecore/semaphore-win32.c
 src/daemon/cpulimit.c
 src/daemon/ltdl-bind-now.c
-src/daemon/polkit.c
 src/daemon/main.c
 src/daemon/cmdline.c
 src/daemon/dumpmodules.c
 src/daemon/daemon-conf.c
 src/daemon/caps.c
 src/daemon/pulseaudio.desktop.in
-src/daemon/org.pulseaudio.policy.in
 src/pulse/channelmap.c
 src/pulse/error.c
 src/pulse/proplist.c