Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/irspy
authorMike Taylor <mike@miketaylor.org.uk>
Mon, 5 Jul 2010 17:39:13 +0000 (18:39 +0100)
committerMike Taylor <mike@miketaylor.org.uk>
Mon, 5 Jul 2010 17:39:13 +0000 (18:39 +0100)

Trivial merge