A nop with something behind it.
authorPeter Palfrader <peter@palfrader.org>
Thu, 10 Jan 2008 14:33:50 +0000 (15:33 +0100)
committerPeter Palfrader <peter@palfrader.org>
Thu, 10 Jan 2008 14:33:50 +0000 (15:33 +0100)
commit2ead5ad6dad3a94f61363bfd1d847a8e595ba681
tree4ae719301a81baa83624fdbce94b73bac5c39ae4
parent69b37c058b347687d7b75fa64efe70b33460d457
parent3a6b6e1ce0ce91574e205b08e9b18d56d0e33683
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.