Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy
authorAdam Dickmeiss <adam@indexdata.dk>
Wed, 22 Dec 2010 13:56:19 +0000 (14:56 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Wed, 22 Dec 2010 13:56:19 +0000 (14:56 +0100)

Trivial merge