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