Merge branch 'socket-set-33337'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Tue, 7 Feb 2012 15:03:56 +0000 (15:03 +0000)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Tue, 7 Feb 2012 15:04:25 +0000 (15:04 +0000)
commit88498b706a39bbe520f9591d8d52b54fb1f8e378
tree5243eb3c97b8039d0ff43cd7121a632bbdb9d3bc
parentb816cb6e900073c6a6126687f2102dfd8e594e68
parent3f4ed9def33c359142c340f28345755ca37663f2
Merge branch 'socket-set-33337'

Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=33337
bus/activation.c
bus/bus.c
bus/connection.c
bus/test.c
configure.ac
dbus/Makefile.am
dbus/dbus-mainloop.c