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

Trivial merge