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)
1  2 
dbus/dbus-sysdeps-unix.c

Simple merge