Mon, 30 Dec 2013 13:34:24 -0500 merge from .20
nemo [Mon, 30 Dec 2013 13:34:24 -0500] rev 9880
merge from .20
(0) -3000 -1000 -300 -100 -30 -10 -1 +1 +10 +30 +100 +300 +1000 +3000 tip