Merge branch 'dbus-1.4'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 24 Feb 2011 18:40:31 +0000 (18:40 +0000)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Thu, 24 Feb 2011 18:40:31 +0000 (18:40 +0000)
commit31a1b24c933c16f026e9e842f80273b484b44e36
treec8f12678adfc4c6d6deb539e9c34bcd221377b8f
parentd9e1959dcfd643bb7b096eba07e326c1093a2ba3
parent7848abe6c2b90b66fbf1fd7e582324b28766b8de
Merge branch 'dbus-1.4'