Merge branch 'my-dbus-1.2'
authorColin Walters <walters@verbum.org>
Mon, 1 Feb 2010 22:27:26 +0000 (17:27 -0500)
committerColin Walters <walters@verbum.org>
Mon, 1 Feb 2010 22:27:26 +0000 (17:27 -0500)
commit6db588b8544e117241a3be2c595dfc8fdcdc8f59
tree7fc15cf9939edecf76d9cfd4163560bc9bc22363
parent2016b83dece7f220269033e7957fb02140334294
parente59db9df47bcf99aa292e6d13ca2044105a94b90
Merge branch 'my-dbus-1.2'
bus/bus.c
bus/dir-watch-inotify.c