diff HACKING @ 21341:789ed158a50a

explicit merge of '2762c6075c0dc52a96098c5478c5bf68cfd890a3' and '6f090c623ea4e9357e5b4238348a888b4c869ab7'
author Richard Laager <rlaager@wiktel.com>
date Fri, 16 Nov 2007 22:38:00 +0000
parents d73ee2690376
children
line wrap: on
line diff