Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/irspy
authorMike Taylor <mike@miketaylor.org.uk>
Wed, 19 May 2010 11:22:22 +0000 (12:22 +0100)
committerMike Taylor <mike@miketaylor.org.uk>
Wed, 19 May 2010 11:22:22 +0000 (12:22 +0100)

Trivial merge