Merge branch 'master' into dbus-work
authorTanu Kaskinen <tanuk@iki.fi>
Mon, 29 Jun 2009 15:35:06 +0000 (18:35 +0300)
committerTanu Kaskinen <tanuk@iki.fi>
Mon, 29 Jun 2009 15:35:06 +0000 (18:35 +0300)
commit0bc538b08ca5c4efea86700cb6c4685da3f34345
treee5b0fe4b967ecb7e9251faf21904bbbe825aaab7
parentb152f3a052eca7225870a7dc4d8a719bee107f0f
parent2654eb7781ddcfe53064745bbad77bffe5c8eada
Merge branch 'master' into dbus-work

Conflicts:
src/daemon/daemon-conf.c
src/daemon/daemon-conf.h
src/daemon/main.c
src/pulsecore/dbus-util.h
configure.ac
src/Makefile.am
src/daemon/daemon-conf.c
src/daemon/daemon-conf.h
src/daemon/daemon.conf.in
src/daemon/default.pa.in
src/daemon/main.c
src/modules/module-dbus-protocol.c
src/pulsecore/core.h
src/pulsecore/dbus-util.c
src/pulsecore/dbus-util.h