A nop with something behind it.

Merge in r361 from alioth-common, the shiftUID patch, but also
cherry pick r377 which reverts it (because it's incomplete/broken).

This is necesary because bzr tracks what you merged so far and
would always want to pull in 361 if I just skipped it now.