Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorAdam Dickmeiss <adam@indexdata.dk>
Mon, 22 Mar 2010 12:26:28 +0000 (13:26 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Mon, 22 Mar 2010 12:26:28 +0000 (13:26 +0100)

Trivial merge