Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/idzebra
authorMike Taylor <mike@miketaylor.org.uk>
Thu, 8 Oct 2009 20:22:32 +0000 (21:22 +0100)
committerMike Taylor <mike@miketaylor.org.uk>
Thu, 8 Oct 2009 20:22:32 +0000 (21:22 +0100)

Trivial merge