Merge branch 'master' into win32-port
authorLove Hornquist Astrand <lha@h5l.org>
Wed, 23 Dec 2009 13:03:37 +0000 (14:03 +0100)
committerLove Hornquist Astrand <lha@h5l.org>
Wed, 23 Dec 2009 13:03:37 +0000 (14:03 +0100)

Trivial merge