Just my 2 cents:
 When I say "I weigh 87 kg" I am abusing the word "weight" to mean that my mass is 87 kg. I'm not abusing the word "kilogram" to mean that the Earth pulls me down with 0.85 kN. I am not willing to look at each revision of that intro paragraph (with my 56K connection it'd take me more time than it'd be worth), but the revision of 27 October ("In everyday usage, the mass of an object in kilograms is often referred to as its weight, although strictly speaking the weight of an object is the gravitational force on it, measured in newtons (see also kilogram-force).") seems quite correct to me. 
 Most of the section "Mass versus weight" doesn't belong to an article about an unit of measurement. If it did, it would belong to the article about the pound, and so on. The mention of the kilogram-force is relevant, but I'd prefer all the rest to go to the Weight article, if anywhere.