Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy
authorAdam Dickmeiss <adam@indexdata.dk>
Wed, 29 Sep 2010 08:19:01 +0000 (10:19 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Wed, 29 Sep 2010 08:19:01 +0000 (10:19 +0200)

Trivial merge