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

Trivial merge