Merge branch 'generate' of git://repo.or.cz/gfxprim into generate