Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorAdam Dickmeiss <adam@indexdata.dk>
Wed, 16 Jun 2010 13:53:02 +0000 (15:53 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Wed, 16 Jun 2010 13:53:02 +0000 (15:53 +0200)

Trivial merge