Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorAdam Dickmeiss <adam@indexdata.dk>
Thu, 1 Jul 2010 13:04:40 +0000 (09:04 -0400)
committerAdam Dickmeiss <adam@indexdata.dk>
Thu, 1 Jul 2010 13:04:40 +0000 (09:04 -0400)

Trivial merge