Merge branch 'upstream' into subtree
[nikiroo-utils.git] / io / TimeoutInputStream.java