Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/idzebra
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 30 Dec 2008 15:45:02 +0000 (16:45 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 30 Dec 2008 15:45:02 +0000 (16:45 +0100)

Trivial merge