Kanzure patch
Merge branch 'master' of git://github.com/epitron/pookie