Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/pazpar2
authorNiels Erik G. Nielsen <nielserik@indexdata.com>
Wed, 28 Apr 2010 22:08:10 +0000 (15:08 -0700)
committerNiels Erik G. Nielsen <nielserik@indexdata.com>
Wed, 28 Apr 2010 22:08:10 +0000 (15:08 -0700)

Trivial merge