Merge branch 'master' of git+ssh://johnp@git.freedesktop.org/git/dbus/dbus
authorJohn (J5) Palmieri <johnp@redhat.com>
Thu, 28 Feb 2008 18:19:14 +0000 (13:19 -0500)
committerJohn (J5) Palmieri <johnp@redhat.com>
Thu, 28 Feb 2008 18:19:14 +0000 (13:19 -0500)

Trivial merge