Merge branch 'master' into wip/win32-port2
authorLove Hornquist Astrand <lha@h5l.org>
Tue, 24 Nov 2009 20:31:00 +0000 (12:31 -0800)
committerLove Hornquist Astrand <lha@h5l.org>
Tue, 24 Nov 2009 20:31:00 +0000 (12:31 -0800)

Trivial merge