Merge commit '826d17c0' into eclair-mr2 * commit '826d17c0': A little more on #2256270: Package manager sends bad broadcasts when components change