Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/git-tools
authorAdam Dickmeiss <adam@indexdata.dk>
Mon, 17 Oct 2011 08:46:16 +0000 (10:46 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Mon, 17 Oct 2011 08:46:16 +0000 (10:46 +0200)

Trivial merge