diff ChangeLog @ 20726:2bb82b05d30a

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