Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorAdam Dickmeiss <adam@indexdata.dk>
Mon, 25 Jan 2010 15:20:19 +0000 (16:20 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Mon, 25 Jan 2010 15:20:19 +0000 (16:20 +0100)

Trivial merge