diff COPYRIGHT @ 21496:0df3d6b11d05

merge of '29c59c7fc04cdf75b2debfab42171f298f82c5fc' and 'd5c59d95a2f6dee5e7af2653c48c880594d8528a'
author Will Thompson <will.thompson@collabora.co.uk>
date Wed, 14 Nov 2007 12:16:30 +0000
parents 38cc722159ff
children 28c63fdcda73
line wrap: on
line diff