Frank Osterfeld authored Oct 21, 2009 and Ralf Habacker committed Dec 01, 2009

Cherry-picked from commit f9bc0f4bd036f6ede5d9850fb0f8587178c85f44 in
the dbus4win repository, slightly massaged to apply by tml@iki.fi.