Comment 4 for bug 628873

Oh, one other thing. I'd like to upgrade the trunk branch to 2a format. It'll make merges and other tasks *so* much easier. Again, happy to take care of it if you approve. It will mean that you'll have to re-branch the trunk, and any stacked branches will be broken, but I think the practical impact of that will be minimal.