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)
commitd48ac213259b72993e087c2757c0bce9e5f32693
tree63f8da52e54b338f95d7d359a60fe64b11f73328
parent5a10fdf3d7f1f2d0fb8e7ac17ef71a93ebb9f8f2
parentc9fdd77bc84fa871b0db681f3731a28a16947531
Merge branch 'master' into wip/win32-port2