diff po/ChangeLog @ 23207:f8a02ba588d1

merge of '740f6d249277d1f3ffc01d5fab1a580c2dd8fc79' and 'c22d824152072143b7ba7eb8b365c97069c60761'
author Will Thompson <will.thompson@collabora.co.uk>
date Mon, 26 May 2008 02:16:05 +0000
parents 6e4a8987a614
children 2d55ac8c4631
line wrap: on
line diff