Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy
authorMike Taylor <mike@indexdata.com>
Wed, 3 Aug 2011 15:50:51 +0000 (16:50 +0100)
committerMike Taylor <mike@indexdata.com>
Wed, 3 Aug 2011 15:50:51 +0000 (16:50 +0100)

Trivial merge