Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorAdam Dickmeiss <adam@indexdata.dk>
Thu, 20 May 2010 11:34:52 +0000 (13:34 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Thu, 20 May 2010 11:34:52 +0000 (13:34 +0200)

Trivial merge