diff COPYING @ 24436:53e7a4b34028

merge of '67feb999e0a93f08cec26793214137c5c5252e9e' and 'ff3034eb9dead184c9e7360113708f18d5364815'
author Will Thompson <will.thompson@collabora.co.uk>
date Fri, 14 Nov 2008 20:46:35 +0000
parents 44b4e8bd759b
children 2341958e33b5
line wrap: on
line diff