Merge branch 'master' of http://github.com/kartorz/linix into HEAD