Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy
authorMike Taylor <mike@indexdata.com>
Wed, 7 Sep 2011 11:18:56 +0000 (12:18 +0100)
committerMike Taylor <mike@indexdata.com>
Wed, 7 Sep 2011 11:18:56 +0000 (12:18 +0100)

Trivial merge