Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorDennis Schafroth <dennis@indexdata.com>
Fri, 4 Jun 2010 10:41:19 +0000 (12:41 +0200)
committerDennis Schafroth <dennis@indexdata.com>
Fri, 4 Jun 2010 10:41:19 +0000 (12:41 +0200)

Trivial merge