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

Trivial merge