Sat, 03 Nov 2012 18:01:38 +0100 merge from 0.9.18
koda [Sat, 03 Nov 2012 18:01:38 +0100] rev 7939
merge from 0.9.18
(0) -3000 -1000 -300 -100 -30 -10 -1 +1 +10 +30 +100 +300 +1000 +3000 tip