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