Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/idzebra
authorMike Taylor <mike@miketaylor.org.uk>
Sun, 17 May 2009 21:31:50 +0000 (22:31 +0100)
committerMike Taylor <mike@miketaylor.org.uk>
Sun, 17 May 2009 21:31:50 +0000 (22:31 +0100)

Trivial merge