Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy
authorAdam Dickmeiss <adam@indexdata.dk>
Thu, 14 Jan 2010 13:09:29 +0000 (14:09 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Thu, 14 Jan 2010 13:09:29 +0000 (14:09 +0100)

Trivial merge