Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/idzebra
authorMike Taylor <mike@miketaylor.org.uk>
Tue, 30 Jun 2009 07:40:06 +0000 (08:40 +0100)
committerMike Taylor <mike@miketaylor.org.uk>
Tue, 30 Jun 2009 07:40:06 +0000 (08:40 +0100)

Trivial merge