diff ChangeLog @ 22743:71e88e6a6608

merge of '8f0b34c54e38066959f87d35b0af2ca6ae0e853b' and 'dde5e18826606b5b71cef9ec3c4d490ebdc3c22f'
author Will Thompson <will.thompson@collabora.co.uk>
date Sat, 26 Apr 2008 12:14:22 +0000
parents 17cd33c5b5ef
children 4040c4ee1f44
line wrap: on
line diff