Tue, 10 Oct 2006 09:30:05 +0200 merge with upstream
Thomas Arendsen Hein <thomas@intevation.de> [Tue, 10 Oct 2006 09:30:05 +0200] rev 3321
merge with upstream
(0) -3000 -1000 -300 -100 -30 -10 -1 +1 +10 +30 +100 +300 +1000 tip