Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorDennis Schafroth <dennis@indexdata.com>
Mon, 17 May 2010 12:16:18 +0000 (14:16 +0200)
committerDennis Schafroth <dennis@indexdata.com>
Mon, 17 May 2010 12:16:18 +0000 (14:16 +0200)

Trivial merge