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)
commit19d48c3344fa0b43d960c2f0b8b5fbb2f9f8cb86
treea786b0c86e20f528fc51d592079317a6b7b4ffb5
parent14f376717e09bf9858b82cc627a26e1e28d216f6
parenta7169e694c48c1259b51f62d73e92292d11bbab2
Merge branch 'my-dbus-1.2'

Conflicts:
configure.in
dbus/dbus-sysdeps-unix.c