update trinity
update trinotate
Merge branch 'master' of git@github.com:bowhan/ppp.git