Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/idzebra
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 22 Mar 2011 13:44:45 +0000 (13:44 +0000)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 22 Mar 2011 13:44:45 +0000 (13:44 +0000)

Trivial merge