Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorNiels Erik G. Nielsen <nielserik@indexdata.com>
Tue, 15 Feb 2011 21:22:23 +0000 (22:22 +0100)
committerNiels Erik G. Nielsen <nielserik@indexdata.com>
Tue, 15 Feb 2011 21:22:23 +0000 (22:22 +0100)

Trivial merge