Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy
authorMike Taylor <mike@indexdata.com>
Wed, 20 Jul 2011 16:17:16 +0000 (17:17 +0100)
committerMike Taylor <mike@indexdata.com>
Wed, 20 Jul 2011 16:17:16 +0000 (17:17 +0100)

Trivial merge