Merge branch 'master' of ssh://git/home/git/pub/pazpar2
authorSebastian Hammer <quinn@dart.indexdata.com>
Sat, 23 Oct 2010 02:56:15 +0000 (02:56 +0000)
committerSebastian Hammer <quinn@dart.indexdata.com>
Sat, 23 Oct 2010 02:56:15 +0000 (02:56 +0000)

Trivial merge