diff COPYRIGHT @ 20825:de042c768169

merge of '7cc9174ede50bc7d7fdfbb47fbcdee031b053f08' and 'e1ef22c0f8bc82d7c69f7e57052e8a799a7241b7'
author Will Thompson <will.thompson@collabora.co.uk>
date Sun, 07 Oct 2007 19:07:59 +0000
parents 02df6998b466
children 27ab73f69275 680e1319b464 975691a8d718
line wrap: on
line diff