Merge branch 'master' of git://lycia.ath.cx/iolib