Merge branch 'dbus-1.2'
authorColin Walters <walters@verbum.org>
Tue, 16 Mar 2010 20:44:48 +0000 (16:44 -0400)
committerColin Walters <walters@verbum.org>
Tue, 16 Mar 2010 20:44:48 +0000 (16:44 -0400)

Trivial merge