Merge branch 'master' of ssh://adam@git.indexdata.com/home/git/pub/yazproxy
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 18 Nov 2008 09:29:17 +0000 (10:29 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 18 Nov 2008 09:29:17 +0000 (10:29 +0100)

Trivial merge