Merge branch 'master' of git+ssh://johnp@git.freedesktop.org/git/dbus/dbus
authorJohn (J5) Palmieri <johnp@redhat.com>
Thu, 3 Apr 2008 15:11:19 +0000 (11:11 -0400)
committerJohn (J5) Palmieri <johnp@redhat.com>
Thu, 3 Apr 2008 15:11:19 +0000 (11:11 -0400)
commit960fef844bdb0054c082a31e43f9631b1d5eb69b
treee39cc0f5db0dce6149711c9088d2965130ade8e0
parenta37404111be4912cd8b51080bcbe219edded35f5
parent68f69d38182ed5974984b0434086e6a288b477cb
Merge branch 'master' of git+ssh://johnp@git.freedesktop.org/git/dbus/dbus

Conflicts:

ChangeLog
ChangeLog