Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/irspy
authorMike Taylor <mike@miketaylor.org.uk>
Thu, 30 Sep 2010 12:53:47 +0000 (13:53 +0100)
committerMike Taylor <mike@miketaylor.org.uk>
Thu, 30 Sep 2010 12:53:47 +0000 (13:53 +0100)

Trivial merge