diff ChangeLog @ 20798:97bda4a072d2

merge of '1757e82b3ed17d8ad45db9d2c62f0187a8bee93d' and '3d1e069061da093a2d8773199e5938f384f2e9f1'
author Will Thompson <will.thompson@collabora.co.uk>
date Sat, 06 Oct 2007 17:49:40 +0000
parents c757b4773a77
children ca17720fabb1 34de8ef19294
line wrap: on
line diff