Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy
authorAdam Dickmeiss <adam@indexdata.dk>
Wed, 29 Feb 2012 08:51:49 +0000 (09:51 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Wed, 29 Feb 2012 08:51:49 +0000 (09:51 +0100)

Trivial merge