diff ChangeLog @ 21468:94b3275eafcc

merge of '7a98d978e56502762335bda8f19011a139ac460a' and 'd2959ce162eb97cc02e8a7f61fe9a804391fdd46'
author Mark Doliner <mark@kingant.net>
date Tue, 13 Nov 2007 18:00:22 +0000
parents d8106b63b0a4
children dde2859a3225
line wrap: on
line diff