Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/idzebra
authorMike Taylor <mike@miketaylor.org.uk>
Thu, 28 May 2009 08:02:21 +0000 (09:02 +0100)
committerMike Taylor <mike@miketaylor.org.uk>
Thu, 28 May 2009 08:02:21 +0000 (09:02 +0100)

Trivial merge