Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/idzebra
authorMike Taylor <mike@miketaylor.org.uk>
Tue, 14 Jul 2009 12:50:49 +0000 (13:50 +0100)
committerMike Taylor <mike@miketaylor.org.uk>
Tue, 14 Jul 2009 12:50:49 +0000 (13:50 +0100)

Trivial merge