Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorNiels Erik G. Nielsen <nielserik@indexdata.com>
Wed, 4 May 2011 20:15:28 +0000 (22:15 +0200)
committerNiels Erik G. Nielsen <nielserik@indexdata.com>
Wed, 4 May 2011 20:15:28 +0000 (22:15 +0200)

Trivial merge