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)
commit18bcf800b65a8ac9de041c5070b3cd4bfb366485
treedf0f04238ce6e2747959336405159d5f20b4a3f4
parentebfa7c02fd67777684d39389e25346819836dcca
parentedecaa4abcc87712d470b9dc0f2d124417b3eebf
Merge branch 'dbus-1.2'