Merge branch 'master' of git+ssh://repo.or.cz/srv/git/Worg
authorBen Alexander <bva@alexanderonline.org>
Fri, 5 Dec 2008 01:23:15 +0000 (01:23 +0000)
committerBen Alexander <bva@alexanderonline.org>
Fri, 5 Dec 2008 01:23:15 +0000 (01:23 +0000)

Trivial merge