Merge branch 'dbus-1.2'
authorWill Thompson <will.thompson@collabora.co.uk>
Fri, 21 May 2010 10:48:28 +0000 (11:48 +0100)
committerWill Thompson <will.thompson@collabora.co.uk>
Fri, 21 May 2010 10:48:28 +0000 (11:48 +0100)
commit01ae2cb79376acb65b876c6620477fde86e6ef12
tree3f5e95b1565a8fb6b935eb8e3a1bca916a85ccb4
parent5f96256c1267f00e6c2c3ff9fe8b05aab5b36f97
parent82a77d6acb0b484a0f21180ad6b8a9b879a54197
Merge branch 'dbus-1.2'

Conflicts:
bus/main.c
configure.in
bus/main.c