diff ChangeLog @ 25377:a4a17fe80160

explicit merge of 'f7807039eeef499a403d638cbcb94060a1d33eea' and '59d53e7606e3c4bd860b9fd6c786f61acf61476b'
author Richard Laager <rlaager@wiktel.com>
date Fri, 02 Jan 2009 22:17:09 +0000
parents 476466aca5e0
children bc9e9463f42c
line wrap: on
line diff