Merge in last changes from Asanka for the win32 port
authorLove Hornquist Astrand <lha@h5l.org>
Wed, 23 Dec 2009 13:17:43 +0000 (14:17 +0100)
committerLove Hornquist Astrand <lha@h5l.org>
Wed, 23 Dec 2009 13:17:43 +0000 (14:17 +0100)
Signed-off-by: Love Hornquist Astrand <lha@h5l.org>

Trivial merge