Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/metaproxy
authorMike Taylor <mike@indexdata.com>
Tue, 23 Aug 2011 12:08:21 +0000 (13:08 +0100)
committerMike Taylor <mike@indexdata.com>
Tue, 23 Aug 2011 12:08:21 +0000 (13:08 +0100)

Trivial merge