Comment 8 for bug 1099405

As discussed on IRC, I've updated my tree to make the master branch match Catalin's tree.

The "ubuntu" branch is the first commit of Catalin's tree.

The "android" branch is a clone of Zach's Android boot-wrapper tree

And the "armlt" branch is the one I've used and know to be good. It's basically the same as Zach's.