a7bbedca97
Merge commit '22dad5928d1d1f2c791616d9d6ab3a3172cec62e' into eclair-mr2 * commit '22dad5928d1d1f2c791616d9d6ab3a3172cec62e': When upgrading packages with shared user ids make sure we are eliminating