Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy
authorAdam Dickmeiss <adam@indexdata.dk>
Mon, 9 Mar 2009 08:05:03 +0000 (09:05 +0100)
committerAdam Dickmeiss <adam@indexdata.dk>
Mon, 9 Mar 2009 08:05:03 +0000 (09:05 +0100)
Conflicts:

m4


Trivial merge