Merge branch 'dbus-1.2'
authorWill Thompson <will.thompson@collabora.co.uk>
Tue, 22 Jun 2010 16:25:20 +0000 (17:25 +0100)
committerWill Thompson <will.thompson@collabora.co.uk>
Tue, 22 Jun 2010 16:25:20 +0000 (17:25 +0100)
commit5d64b7a1b792789fd1d41ad99624b578dddcf4b4
tree16191abffeae6bc583fa321fdfe2137b1bd739a2
parente40c45fb4635321f17f3d6e4f9a4566fb62b3623
parent085e7730b88a0c4a42a325c3ed4dd99f0b67185b
Merge branch 'dbus-1.2'
bus/config-parser-trivial.c
bus/config-parser-trivial.h