Merge branch 'dbus-1.4'
authorLennart Poettering <lennart@poettering.net>
Thu, 28 Jul 2011 19:45:35 +0000 (21:45 +0200)
committerLennart Poettering <lennart@poettering.net>
Thu, 28 Jul 2011 19:45:35 +0000 (21:45 +0200)
commit7953ca2f81102785f0a7ebac8e4e5789391c79f3
tree0e1ff5dcc37f6d37b81b292ac3bd3dfe0eb193d8
parent3e2519b49a1ed57dd997bbc4a195efc2205499f3
parent0614a49274b85384f798beb3440c875091224c5a
Merge branch 'dbus-1.4'
dbus/dbus-sysdeps-unix.c