Add the odinmonkey branch
Automated conversion from mozilla-inbound
Automated conversion from mozilla-odinmonkey