Merge branch 'master' of ssh://slack.codemaniacs.com/~/slack.codemaniacs.com/git...
authorslack <slack@Blackbird.(none)>
Thu, 2 Oct 2008 20:33:08 +0000 (22:33 +0200)
committerslack <slack@Blackbird.(none)>
Thu, 2 Oct 2008 20:33:08 +0000 (22:33 +0200)

Trivial merge