Merge branch 'master' of ssh://git/home/git/pub/pazpar2
authorSebastian Hammer <quinn@indexdata.com>
Mon, 28 Jul 2008 08:29:04 +0000 (08:29 +0000)
committerSebastian Hammer <quinn@indexdata.com>
Mon, 28 Jul 2008 08:29:04 +0000 (08:29 +0000)

Trivial merge