Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy
authorAdam Dickmeiss <adam@indexdata.dk>
Fri, 25 Feb 2011 14:18:23 +0000 (15:18 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Fri, 25 Feb 2011 14:18:23 +0000 (15:18 +0100)

Trivial merge