Merge branch 'master' of git+ssh://claviclaws@repo.or.cz/srv/git/Worg
authorChristopher Suckling <suckling@gmail.com>
Mon, 20 Jul 2009 22:38:41 +0000 (23:38 +0100)
committerChristopher Suckling <suckling@gmail.com>
Mon, 20 Jul 2009 22:38:41 +0000 (23:38 +0100)

Trivial merge