Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/irspy
authorMike Taylor <mike@miketaylor.org.uk>
Mon, 12 Apr 2010 13:12:07 +0000 (14:12 +0100)
committerMike Taylor <mike@miketaylor.org.uk>
Mon, 12 Apr 2010 13:12:07 +0000 (14:12 +0100)

Trivial merge