Tue, 13 Oct 2009 08:48:00 +0200 fix bad merges
Sylvain Thénault <sylvain.thenault@logilab.fr> [Tue, 13 Oct 2009 08:48:00 +0200] rev 3646
fix bad merges
(0) -3000 -1000 -300 -100 -30 -10 -1 +1 +10 +30 +100 +300 +1000 +3000 tip