Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yazproxy
authorAdam Dickmeiss <adam@indexdata.dk>
Tue, 17 Mar 2009 15:06:39 +0000 (16:06 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Tue, 17 Mar 2009 15:06:39 +0000 (16:06 +0100)

Trivial merge