Merge branch 'dbus-1.4'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 25 Feb 2011 15:49:55 +0000 (15:49 +0000)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Fri, 25 Feb 2011 15:49:55 +0000 (15:49 +0000)
commit07d2ca2b52570db6591b61b5ca24913d8f936e55
treee86928861ef0107d7be6c1beb1748217158c02a1
parent31a1b24c933c16f026e9e842f80273b484b44e36
parentf1ba52066cadb90edb192ea93d55ba775bdb73d7
Merge branch 'dbus-1.4'

Conflicts:
NEWS
NEWS