Merge branch 'dbus-1.4'
authorRalf Habacker <ralf.habacker@freenet.de>
Fri, 28 Oct 2011 19:41:55 +0000 (21:41 +0200)
committerRalf Habacker <ralf.habacker@freenet.de>
Fri, 28 Oct 2011 19:41:55 +0000 (21:41 +0200)
1  2 
dbus/dbus-sysdeps-win.c

Simple merge