Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/idzebra
authorAdam Dickmeiss <adam@indexdata.dk>
Wed, 22 Dec 2010 13:29:26 +0000 (14:29 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Wed, 22 Dec 2010 13:29:26 +0000 (14:29 +0100)

Trivial merge