Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/idzebra
authorMike Taylor <mike@miketaylor.org.uk>
Fri, 18 Sep 2009 16:42:23 +0000 (17:42 +0100)
committerMike Taylor <mike@miketaylor.org.uk>
Fri, 18 Sep 2009 16:42:23 +0000 (17:42 +0100)

Trivial merge