Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy
authorMike Taylor <mike@indexdata.com>
Fri, 26 Aug 2011 14:09:33 +0000 (15:09 +0100)
committerMike Taylor <mike@indexdata.com>
Fri, 26 Aug 2011 14:09:33 +0000 (15:09 +0100)

Trivial merge