Merge branch 'master' of git://repo.or.cz/rox-filer