Merge branch 'master' of ssh://git/home/git/pub/pazpar2
authorSebastian Hammer <quinn@dart.(none)>
Wed, 24 Mar 2010 15:35:12 +0000 (15:35 +0000)
committerSebastian Hammer <quinn@dart.(none)>
Wed, 24 Mar 2010 15:35:12 +0000 (15:35 +0000)

Trivial merge