Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/idzebra
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 28 Jun 2011 15:16:53 +0000 (17:16 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 28 Jun 2011 15:16:53 +0000 (17:16 +0200)

Trivial merge