diff ChangeLog @ 20725:2e5ee1bf5300

merge of 'c966d1b59a11c860df756f5def6e3486d94f24e3' and 'e601ebdd94cff16d6ca584394217a48567b213d8'
author Will Thompson <will.thompson@collabora.co.uk>
date Sun, 30 Sep 2007 16:55:15 +0000
parents e73e0060a4dd
children 15f61e6b15cd
line wrap: on
line diff