Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorAdam Dickmeiss <adam@indexdata.dk>
Sun, 21 Feb 2010 18:52:39 +0000 (19:52 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Sun, 21 Feb 2010 18:52:39 +0000 (19:52 +0100)

Trivial merge