diff ChangeLog.API @ 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 51aff4db29da
children f33ed41b6dee 34fc2a999977 4511d15a8f80 5cd2fe9a6629
line wrap: on
line diff