Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/irspy
authorMike Taylor <mike@miketaylor.org.uk>
Tue, 20 Apr 2010 16:02:35 +0000 (17:02 +0100)
committerMike Taylor <mike@miketaylor.org.uk>
Tue, 20 Apr 2010 16:02:35 +0000 (17:02 +0100)

Trivial merge