Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorDennis Schafroth <dennis@indexdata.com>
Tue, 4 May 2010 15:40:10 +0000 (17:40 +0200)
committerDennis Schafroth <dennis@indexdata.com>
Tue, 4 May 2010 15:40:10 +0000 (17:40 +0200)

Trivial merge