Merge branch 'pvip' of github.com:tokuhirom/kiji into pvip
Gah.