Merge branch 'dbus-1.4'
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Tue, 7 Jun 2011 13:37:30 +0000 (14:37 +0100)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Tue, 7 Jun 2011 13:37:30 +0000 (14:37 +0100)
commita09de5c004b8943456ea686e5e9d38fabade5834
tree37376451da6d89695ef98e306cf5da3d2ca3d82e
parentcb90bd5eb334fdcd705c0ecde96ee34b54c59768
parentf0d4e0fc974e642f54aaf58907db8d5284d9013d
Merge branch 'dbus-1.4'

Conflicts:
NEWS
NEWS
configure.ac