Let's branch 2.1. We're trying to drive 2.1 to an RC worthy state.
Meanwhile, there is some new development in the pipe that shouldn't go
into 2.1 but needs a home in SVN. That can go into trunk once the 2.1
branch is created. Sound good?