Mon, 02 Mar 2009 19:27:06 +0100 merged, resolving minor conflicts;
wenzelm [Mon, 02 Mar 2009 19:27:06 +0100] rev 34534
merged, resolving minor conflicts;
(0) -30000 -10000 -3000 -1000 -300 -100 -30 -10 -1 +1 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip