Merge commit '3d6abf64d0abb2718e082e120f14f8f923a4af59' into dbus-1.2
authorColin Walters <walters@verbum.org>
Tue, 16 Dec 2008 17:29:04 +0000 (12:29 -0500)
committerColin Walters <walters@verbum.org>
Tue, 16 Dec 2008 17:29:04 +0000 (12:29 -0500)
commitc224ba1861b1492db7e1f7f8c9f183acd2076c79
treed4355bc2d3e5ebe703e4488522400270b6d1c701
parent427ff01f9d656700b370bb905fe738e76602a842
parent3d6abf64d0abb2718e082e120f14f8f923a4af59
Merge commit '3d6abf64d0abb2718e082e120f14f8f923a4af59' into dbus-1.2
bus/system.conf.in
test/name-test/tmp-session-like-system.conf