Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorAdam Dickmeiss <adam@indexdata.dk>
Mon, 29 Mar 2010 13:04:09 +0000 (15:04 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Mon, 29 Mar 2010 13:04:09 +0000 (15:04 +0200)

Trivial merge