Merge branch 'dbus-1.4'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 29 Jul 2011 11:52:32 +0000 (12:52 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 29 Jul 2011 11:52:32 +0000 (12:52 +0100)
commit3c4b38b4bac0d23cf8c65154e1f2ae3506e42a33
treee719c3124d912dc49ac17f380f033c748528b6d2
parente3c12a86d6bea9e212c58ddbf3dc4640b74f9021
parentbae9bb547f0ccee9b84d1bdef8f21b096d219756
Merge branch 'dbus-1.4'

Conflicts:
NEWS
NEWS
dbus/dbus-sysdeps-unix.c