R1:af654f838bd3

Lvc: rewrote hg branch rename to use rebase... much simpler.