cleanup totoro
Merge remote-tracking branch 'cmx/gingerbread' into gingerbread