Merge branch 'dbus-1.4' rejecting commit 4ebb275ab7b6f71d5
authorSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 23 Jan 2012 11:14:45 +0000 (11:14 +0000)
committerSimon McVittie <simon.mcvittie@collabora.co.uk>
Mon, 23 Jan 2012 11:14:45 +0000 (11:14 +0000)
commitb080ba1eab764b79edb62afcfc61794f410a5591
tree9911fc680a5871cb06efe92a509268e509854d7e
parent11b31b864fe7aad4084544f9f846a2ddfe39c28a
parent4ebb275ab7b6f71d5dbee348a1064b013bdbc862
Merge branch 'dbus-1.4' rejecting commit 4ebb275ab7b6f71d5

Conflicts:
configure.ac