Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/idzebra
authorMike Taylor <mike@miketaylor.org.uk>
Sun, 21 Jun 2009 09:16:52 +0000 (10:16 +0100)
committerMike Taylor <mike@miketaylor.org.uk>
Sun, 21 Jun 2009 09:16:52 +0000 (10:16 +0100)

Trivial merge