diff COPYRIGHT @ 21459:675fbb9a402e

merge of '42565dfdfb1d0477d08281c1c37e99bba59c56fc' and '50186cf4da94766e7f15dc727898da51f906c649'
author Will Thompson <will.thompson@collabora.co.uk>
date Mon, 12 Nov 2007 18:59:14 +0000
parents 38cc722159ff
children 28c63fdcda73
line wrap: on
line diff