Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy
authorAdam Dickmeiss <adam@indexdata.dk>
Fri, 24 Jun 2011 11:03:56 +0000 (13:03 +0200)
committerAdam Dickmeiss <adam@indexdata.dk>
Fri, 24 Jun 2011 11:03:56 +0000 (13:03 +0200)

Trivial merge