Merge remote branch 'cvs/master'
commit1396415319dd907bababba0f4f0b6626ef0bd7c1
authorMichael J Gruber <aboutconfig-owner@mozdev.org>
Mon, 23 Nov 2009 20:53:46 +0000 (23 21:53 +0100)
committerMichael J Gruber <aboutconfig-owner@mozdev.org>
Mon, 23 Nov 2009 20:53:46 +0000 (23 21:53 +0100)
tree0d68300abc68c00945e1ac2392a99a4623077391
parent2f4fab373812b9be1800d90ca4d1767ebe53fb12
parenta7a38d8ae7bc1d27453ebd57f3917391053840a3
Merge remote branch 'cvs/master'