Merge branch 'my-dbus-1.2'
authorColin Walters <walters@verbum.org>
Tue, 2 Feb 2010 16:00:09 +0000 (11:00 -0500)
committerColin Walters <walters@verbum.org>
Tue, 2 Feb 2010 16:00:09 +0000 (11:00 -0500)
Conflicts:
configure.in


No differences found