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

Cherry-picked from commit e7a070db22ed4a84dc04a062255356c9f6c4c9c5 in
the dbus4win repository, trailing whitespace issues corrected by
tml@iki.fi.