Merge branch 'master' of ssh://git.freedesktop.org/git/dbus/dbus
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 10 Oct 2007 16:39:41 +0000 (17:39 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Wed, 10 Oct 2007 16:39:41 +0000 (17:39 +0100)
commit077fb290c57ee937330b22b2ae794fc9967d4722
treebf0bc225d70cfbda574a7b4b625b25408a155961
parent8cff9309bf0502ea9147f81cb12d0e067f9ba862
parent1ca4b10e3000b0fe918537c20efa35ea1ffb5b26
Merge branch 'master' of ssh://git.freedesktop.org/git/dbus/dbus