sync cvs as of 2013-01-12 (late in the evening)