tree 2b2b18e617ba9e4eb3fa5ef5ee887bf703115354
parent 544c63c86669e45a6b640941eb273edab6661074
author Avery Pennarun <apenwarr@gmail.com> 1345884548 -0400
committer Avery Pennarun <apenwarr@gmail.com> 1345884548 -0400

Merge octopus into HEAD.

Change-Id: I6c888b1a50caadbcb3ec29a5ba5867385ad5b4b4