diff COPYRIGHT @ 22147:2e62ff5ec311

merge of '3b6aca6b8be6a2416cca6f8f28a7f23eaea5a974' and 'd885940f85d3470758b1b8a8c08f8529d8b98646'
author Sean Egan <seanegan@gmail.com>
date Thu, 17 Jan 2008 21:07:06 +0000
parents 4ab154a14e55
children 9559469acd62
line wrap: on
line diff