Merge branch 'master' of ssh://git/home/git/pub/pazpar2
authorSebastian Hammer <quinn@dart.(none)>
Wed, 2 Jun 2010 14:15:05 +0000 (14:15 +0000)
committerSebastian Hammer <quinn@dart.(none)>
Wed, 2 Jun 2010 14:15:05 +0000 (14:15 +0000)

Trivial merge