Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/git-tools
authorAdam Dickmeiss <adam@lenny.(none)>
Tue, 25 Nov 2008 10:18:21 +0000 (11:18 +0100)
committerAdam Dickmeiss <adam@lenny.(none)>
Tue, 25 Nov 2008 10:18:21 +0000 (11:18 +0100)

Trivial merge