Merge branch 'master' of git://repo.or.cz/rox-lib
tree7ae8534f6f338766058409aa3bc1ac24dcc68cd0
drwxr-xr-x - ROX-Lib2