merge from freedesktop.org

Merge git://anongit.freedesktop.org/git/dbus/dbus-c++

Conflicts:

	examples/echo/echo-server.cpp
	examples/properties/props-server.cpp
This commit is contained in:
Andreas Volz 2008-09-29 23:17:03 +02:00
commit 13219dd9fc
18 changed files with 124 additions and 167 deletions