Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorAdam Dickmeiss <adam@indexdata.dk>
Fri, 1 Apr 2011 11:53:15 +0000 (13:53 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Fri, 1 Apr 2011 11:53:15 +0000 (13:53 +0200)

Trivial merge