Merge branch 'dbus-1.4', rejecting all changes

This commit changes nothing, but means that merge tracking won't try to
apply the reversion of d1d395774435..09c9d6406b75f to master in future.
This commit is contained in:
Simon McVittie 2011-03-14 11:53:24 +00:00
commit 81f2aa238b

Diff content is not available